fix conflict

This commit is contained in:
minggo
2022-01-24 17:23:03 +08:00
1037 changed files with 16742 additions and 16228 deletions
@@ -1,5 +1,5 @@
/****************************************************************************
Copyright (c) 2021 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021-2022 Xiamen Yaji Software Co., Ltd.
http://www.cocos.com
@@ -28,7 +28,7 @@
#include "platform/java/jni/JniImp.h"
namespace cc {
CommonSystem::CommonSystem() = default;
CommonSystem::CommonSystem() = default;
CommonSystem::~CommonSystem() = default;
std::string CommonSystem::getDeviceModel() const {