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) 2018-2021 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2018-2022 Xiamen Yaji Software Co., Ltd.
http://www.cocos.com
@@ -26,13 +26,12 @@
#pragma once
#include <string>
#include <vector>
#include "platform/java/jni/JniHelper.h"
#include "cocos/bindings/jswrapper/SeApi.h"
#include "platform/java/jni/JniHelper.h"
namespace se {
class Object;
}
bool register_javascript_java_bridge(se::Object *obj); // NOLINT(readability-identifier-naming)
bool register_script_native_bridge(se::Object *obj); // NOLINT(readability-identifier-naming)
bool register_javascript_java_bridge(se::Object *obj); // NOLINT(readability-identifier-naming)
bool register_script_native_bridge(se::Object *obj); // NOLINT(readability-identifier-naming)
void callPlatformStringMethod(const std::string &arg0, const std::string &arg1); // NOLINT(readability-identifier-naming)