From 16b78678a70eabc5b5e6533b6f963d3918b34d32 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 11 Dec 2020 14:44:28 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

---
 Assets/Animations/Endless/Tower/Fire/Normal.controller.meta |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Assets/Animations/Endless/Tower/Fire/Normal.controller.meta b/Assets/Animations/Endless/Tower/Fire/Normal.controller.meta
index 6f03c60..404b1de 100644
--- a/Assets/Animations/Endless/Tower/Fire/Normal.controller.meta
+++ b/Assets/Animations/Endless/Tower/Fire/Normal.controller.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a3311add5fe619d43885374d95834ba9
+guid: 67cb49db63752f743ab4587df0cd4613
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 0

--
Gitblit v1.9.1