.gitattributes 573 B

12345678910
  1. GameClient/ProjectSettings merge=ours
  2. GameClient/Assets/Plugins/Android/AndroidManifest.xml merge=ours
  3. GameClient/Assets/Plugins/Android/baseProjectTemplate.gradle merge=ours
  4. GameClient/Assets/Plugins/Android/gradleTemplate.properties merge=ours
  5. GameClient/Assets/Plugins/Android/launcherTemplate.gradle merge=ours
  6. GameClient/Assets/Plugins/com/easy/bridge/DouYouMainActivity.java merge=ours
  7. GameClient/Assets/Plugins/com/easy/bugly/GamePlayerActivity.java merge=ours
  8. GameClient/Assets/Plugins merge=ours
  9. GameClient/ProjectSettings merge=ours
  10. GameClient/Packages merge=ours