fixmerge

ee2c5cda · nanahira · c53f3dcf · ee2c5cda
Commit ee2c5cda authored Apr 08, 2019 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

ProjectSettings/ProjectSettings.asset ProjectSettings/ProjectSettings.asset +0 -4

No files found.
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -123,11 +123,7 @@ PlayerSettings:
    16:10: 1
    16:9: 1
    Others: 1
-<<<<<<< HEAD
  bundleVersion: 1.034.9-6
-=======
-  bundleVersion: 2.2.4 (1.034.9)
->>>>>>> 484acaaace2d16c49357850e5755968163904067
  preloadedAssets: []
  metroInputSource: 0
  m_HolographicPauseOnTrackingLoss: 1