|
|
@@ -6,3 +6,5 @@ GameClient/Assets/Plugins/Android/launcherTemplate.gradle merge=ours
|
|
|
GameClient/Assets/Plugins/com/easy/bridge/DouYouMainActivity.java merge=ours
|
|
|
GameClient/Assets/Plugins/com/easy/bugly/GamePlayerActivity.java merge=ours
|
|
|
GameClient/Assets/Plugins merge=ours
|
|
|
+GameClient/ProjectSettings merge=ours
|
|
|
+GameClient/Packages merge=ours
|
