hexiaojie 1 년 전
부모
커밋
5b3491a41f
1개의 변경된 파일8개의 추가작업 그리고 0개의 파일을 삭제
  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