mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 15:42:39 +08:00
fix conflict
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
#include "platform/java/jni/JniImp.h"
|
||||
#include "platform/java/jni/glue/JniNativeGlue.h"
|
||||
|
||||
|
||||
namespace {
|
||||
|
||||
} // namespace
|
||||
|
||||
Reference in New Issue
Block a user