changes.

2018-04-10 14:27:15 -05:00 · 2018-04-10 14:27:15 -05:00 · 517b5ff95a
commit 517b5ff95a
parent 99250b6b4c
5 changed files with 25 additions and 0 deletions
--- a/MoCha/Assets/Plugins.meta~Stashed
+++ b/MoCha/Assets/Plugins.meta~Stashed
@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 36a268db14e08be4586c27503c77855b
+folderAsset: yes
+timeCreated: 1523388046
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/MoCha/Assets/Plugins.meta~Stashed
+++ b/MoCha/Assets/Plugins.meta~Stashed
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: a6833ac8a2686c841ac5a1b5b7b9be48
+timeCreated: 1523388413
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/MoCha/Assets/Plugins/Android.meta
+++ b/MoCha/Assets/Plugins/Android.meta
@ -1,7 +1,13 @@
 fileFormatVersion: 2
+<<<<<<< Updated upstream
 guid: 8cd453422b2e32245b54c76a62e2a81e
 folderAsset: yes
 timeCreated: 1523387294
+=======
+guid: e306a28a11a4976488ab98bb77d05c1d
+folderAsset: yes
+timeCreated: 1523388046
+>>>>>>> Stashed changes
 licenseType: Free
 DefaultImporter:
  externalObjects: {}
--- a/MoCha/Assets/Prefabs/Canvas.prefab
+++ b/MoCha/Assets/Prefabs/Canvas.prefab
--- a/MoCha/Assets/Scenes/Main.unity
+++ b/MoCha/Assets/Scenes/Main.unity