From 22d482183aa44aa2ffd837d8939a7b0bd15d28b9 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Thu, 29 Oct 2020 10:45:21 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

---
 Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDAADemoScript.cs.meta |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGADemoScript.cs.meta b/Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDAADemoScript.cs.meta
similarity index 84%
rename from Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGADemoScript.cs.meta
rename to Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDAADemoScript.cs.meta
index e3c503c..dca72d8 100644
--- a/Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGADemoScript.cs.meta
+++ b/Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDAADemoScript.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7f8ff66103660e04096defa0bf88ae0b
+guid: 4839422511da3f1499f47ec8702a09f6
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

--
Gitblit v1.9.1