From 54181477c210344b037d88f17dbe2cddc5cbc930 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 02 Dec 2020 17:54:32 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

---
 Assets/Scripts/Guide/GuidePanelNew.cs.meta |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Assets/Scripts/Guide/ImageSkillRim.cs.meta b/Assets/Scripts/Guide/GuidePanelNew.cs.meta
similarity index 83%
rename from Assets/Scripts/Guide/ImageSkillRim.cs.meta
rename to Assets/Scripts/Guide/GuidePanelNew.cs.meta
index 84422d7..c776c55 100644
--- a/Assets/Scripts/Guide/ImageSkillRim.cs.meta
+++ b/Assets/Scripts/Guide/GuidePanelNew.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b853ac60c2d385d4dbc98c0d558451bb
+guid: 47bea72fb1148544ca4ffbee6b6ad7be
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

--
Gitblit v1.9.1