From 8504e890b7c7dcd00241b38693aaccc321ee9cea Mon Sep 17 00:00:00 2001 From: shadow8t4 Date: Thu, 3 May 2018 18:31:39 -0500 Subject: [PATCH] Fixing errors from merges. --- MoCha/Assets/Scenes/Home.unity | Bin 97176 -> 94872 bytes MoCha/Assets/Scenes/StepCounter.unity.meta | 7 ------- .../Scripts/CustomAndroidPlugin.cs.meta | 5 ----- MoCha/Assets/Scripts/FitBitAPI.cs.meta | 5 ----- MoCha/Assets/Scripts/FitbitData.cs.meta | 5 ----- MoCha/Assets/Scripts/JSONObject.cs.meta | 5 ----- .../Assets/Scripts/OAuth2AccessToken.cs.meta | 5 ----- 7 files changed, 32 deletions(-) diff --git a/MoCha/Assets/Scenes/Home.unity b/MoCha/Assets/Scenes/Home.unity index a6951d8aa17a30e43c5536edcdcf7dfd129f01a9..2066e316c8a67a8dc3307603133f4c34e46a3902 100644 GIT binary patch delta 8382 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 RnrZD;3EtY;uM#$f{|A8vT+#pl delta 8666 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 diff --git a/MoCha/Assets/Scenes/StepCounter.unity.meta b/MoCha/Assets/Scenes/StepCounter.unity.meta index b9cc508..535bf2c 100644 --- a/MoCha/Assets/Scenes/StepCounter.unity.meta +++ b/MoCha/Assets/Scenes/StepCounter.unity.meta @@ -1,15 +1,8 @@ fileFormatVersion: 2 guid: e5fcab55ab6a24d8eb5dd6198b597019 -<<<<<<< HEAD timeCreated: 1497532216 licenseType: Pro DefaultImporter: -======= -timeCreated: 1523382829 -licenseType: Free -DefaultImporter: - externalObjects: {} ->>>>>>> alex userData: assetBundleName: assetBundleVariant: diff --git a/MoCha/Assets/Scripts/CustomAndroidPlugin.cs.meta b/MoCha/Assets/Scripts/CustomAndroidPlugin.cs.meta index a7829bd..a23005d 100644 --- a/MoCha/Assets/Scripts/CustomAndroidPlugin.cs.meta +++ b/MoCha/Assets/Scripts/CustomAndroidPlugin.cs.meta @@ -1,11 +1,6 @@ fileFormatVersion: 2 -<<<<<<< Updated upstream guid: 80685d60eb42cd340a5c76d410187801 timeCreated: 1524716619 -======= -guid: 1d9a971c325c98e4a81ea4ec2e52aed6 -timeCreated: 1524756178 ->>>>>>> Stashed changes licenseType: Free MonoImporter: externalObjects: {} diff --git a/MoCha/Assets/Scripts/FitBitAPI.cs.meta b/MoCha/Assets/Scripts/FitBitAPI.cs.meta index beb83a4..8514324 100644 --- a/MoCha/Assets/Scripts/FitBitAPI.cs.meta +++ b/MoCha/Assets/Scripts/FitBitAPI.cs.meta @@ -1,11 +1,6 @@ fileFormatVersion: 2 -<<<<<<< Updated upstream guid: aa5e856e9b878764db7c192f3aa20277 timeCreated: 1524716713 -======= -guid: 849590d4a954ae445aa5db73d734450c -timeCreated: 1524756213 ->>>>>>> Stashed changes licenseType: Free MonoImporter: externalObjects: {} diff --git a/MoCha/Assets/Scripts/FitbitData.cs.meta b/MoCha/Assets/Scripts/FitbitData.cs.meta index e0b1ea8..add5ba3 100644 --- a/MoCha/Assets/Scripts/FitbitData.cs.meta +++ b/MoCha/Assets/Scripts/FitbitData.cs.meta @@ -1,11 +1,6 @@ fileFormatVersion: 2 -<<<<<<< Updated upstream guid: 7a928c029cb14204588724261a513ec1 timeCreated: 1524716713 -======= -guid: 1d8622418b8bead4cad17658d650c6c2 -timeCreated: 1524756213 ->>>>>>> Stashed changes licenseType: Free MonoImporter: externalObjects: {} diff --git a/MoCha/Assets/Scripts/JSONObject.cs.meta b/MoCha/Assets/Scripts/JSONObject.cs.meta index 7347c44..c095bab 100644 --- a/MoCha/Assets/Scripts/JSONObject.cs.meta +++ b/MoCha/Assets/Scripts/JSONObject.cs.meta @@ -1,11 +1,6 @@ fileFormatVersion: 2 -<<<<<<< Updated upstream guid: da64cad21a33a6444ac511376fcb771b timeCreated: 1524716713 -======= -guid: 9101b04121334074fb6e70fc34eeb3f9 -timeCreated: 1524756213 ->>>>>>> Stashed changes licenseType: Free MonoImporter: externalObjects: {} diff --git a/MoCha/Assets/Scripts/OAuth2AccessToken.cs.meta b/MoCha/Assets/Scripts/OAuth2AccessToken.cs.meta index ba51381..320c6d8 100644 --- a/MoCha/Assets/Scripts/OAuth2AccessToken.cs.meta +++ b/MoCha/Assets/Scripts/OAuth2AccessToken.cs.meta @@ -1,11 +1,6 @@ fileFormatVersion: 2 -<<<<<<< Updated upstream guid: 2e4069fa83cbbb041aa91e83f7ece28e timeCreated: 1524716713 -======= -guid: 1d4c10710438d404085599a6fe50d37b -timeCreated: 1524756213 ->>>>>>> Stashed changes licenseType: Free MonoImporter: externalObjects: {}