From 21a1542f9d99466b2aedd0992a1032b37b4154a3 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 20 八月 2018 20:21:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer

---
 System/Strengthening/GodBeastReinforcementWin.cs.meta |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/System/Role/RolePoint.cs.meta b/System/Strengthening/GodBeastReinforcementWin.cs.meta
similarity index 75%
rename from System/Role/RolePoint.cs.meta
rename to System/Strengthening/GodBeastReinforcementWin.cs.meta
index 8d0a009..e439d1c 100644
--- a/System/Role/RolePoint.cs.meta
+++ b/System/Strengthening/GodBeastReinforcementWin.cs.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 77a6a757b99422846bb5b68b65b5af18
-timeCreated: 1502422861
+guid: 69585e30fb1796b42b2b119b864f6776
+timeCreated: 1534421646
 licenseType: Free
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0