ada/mochapine64backup
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing errors from merges.

Browse source
This commit is contained in:
shadow8t4 2018-05-03 18:31:39 -05:00
parent ecb4c71577
commit 8504e890b7
7 changed files with 0 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
MoCha/Assets/Scenes/Home.unity
View file

Binary file not shown.

7
MoCha/Assets/Scenes/StepCounter.unity.meta
View file

@ -1,15 +1,8 @@
fileFormatVersion: 2
guid: e5fcab55ab6a24d8eb5dd6198b597019
<<<<<<< HEAD
timeCreated: 1497532216
licenseType: Pro
DefaultImporter:
=======
timeCreated: 1523382829
licenseType: Free
DefaultImporter:
externalObjects: {}
>>>>>>> alex
userData:
assetBundleName:
assetBundleVariant:

5
MoCha/Assets/Scripts/CustomAndroidPlugin.cs.meta
View file

@ -1,11 +1,6 @@
fileFormatVersion: 2
<<<<<<< Updated upstream
guid: 80685d60eb42cd340a5c76d410187801
timeCreated: 1524716619
=======
guid: 1d9a971c325c98e4a81ea4ec2e52aed6
timeCreated: 1524756178
>>>>>>> Stashed changes
licenseType: Free
MonoImporter:
externalObjects: {}

5
MoCha/Assets/Scripts/FitBitAPI.cs.meta
View file

@ -1,11 +1,6 @@
fileFormatVersion: 2
<<<<<<< Updated upstream
guid: aa5e856e9b878764db7c192f3aa20277
timeCreated: 1524716713
=======
guid: 849590d4a954ae445aa5db73d734450c
timeCreated: 1524756213
>>>>>>> Stashed changes
licenseType: Free
MonoImporter:
externalObjects: {}

5
MoCha/Assets/Scripts/FitbitData.cs.meta
View file

@ -1,11 +1,6 @@
fileFormatVersion: 2
<<<<<<< Updated upstream
guid: 7a928c029cb14204588724261a513ec1
timeCreated: 1524716713
=======
guid: 1d8622418b8bead4cad17658d650c6c2
timeCreated: 1524756213
>>>>>>> Stashed changes
licenseType: Free
MonoImporter:
externalObjects: {}

5
MoCha/Assets/Scripts/JSONObject.cs.meta
View file

@ -1,11 +1,6 @@
fileFormatVersion: 2
<<<<<<< Updated upstream
guid: da64cad21a33a6444ac511376fcb771b
timeCreated: 1524716713
=======
guid: 9101b04121334074fb6e70fc34eeb3f9
timeCreated: 1524756213
>>>>>>> Stashed changes
licenseType: Free
MonoImporter:
externalObjects: {}

5
MoCha/Assets/Scripts/OAuth2AccessToken.cs.meta
View file

@ -1,11 +1,6 @@
fileFormatVersion: 2
<<<<<<< Updated upstream
guid: 2e4069fa83cbbb041aa91e83f7ece28e
timeCreated: 1524716713
=======
guid: 1d4c10710438d404085599a6fe50d37b
timeCreated: 1524756213
>>>>>>> Stashed changes
licenseType: Free
MonoImporter:
externalObjects: {}