hexiaojie hai 1 ano
pai
achega
5b3491a41f
Modificáronse 1 ficheiros con 8 adicións e 0 borrados
  1. 8 0
      .gitattributes

+ 8 - 0
.gitattributes

@@ -0,0 +1,8 @@
+GameClient/ProjectSettings merge=ours
+GameClient/Assets/Plugins/Android/AndroidManifest.xml merge=ours
+GameClient/Assets/Plugins/Android/baseProjectTemplate.gradle merge=ours
+GameClient/Assets/Plugins/Android/gradleTemplate.properties merge=ours
+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