Updated.

2018-04-10 14:52:01 -05:00 · 2018-04-10 14:52:01 -05:00 · cffe754268
commit cffe754268
parent 517b5ff95a 146677f069
3 changed files with 0 additions and 16 deletions
--- a/MoCha/Assets/Plugins/Android.meta
+++ b/MoCha/Assets/Plugins/Android.meta
@ -1,16 +0,0 @@
-fileFormatVersion: 2
-<<<<<<< Updated upstream
-guid: 8cd453422b2e32245b54c76a62e2a81e
-folderAsset: yes
-timeCreated: 1523387294
-=======
-guid: e306a28a11a4976488ab98bb77d05c1d
-folderAsset: yes
-timeCreated: 1523388046
->>>>>>> Stashed changes
-licenseType: Free
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/MoCha/Assets/Scenes/Main.unity
+++ b/MoCha/Assets/Scenes/Main.unity
--- a/MoCha/ProjectSettings/ProjectSettings.asset
+++ b/MoCha/ProjectSettings/ProjectSettings.asset