From 79457ed9f96d8b2b1e097a8e8940d09bb20385aa Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 19 四月 2019 09:44:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

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

diff --git a/System/MainInterfacePanel/SkillContainerResetTimer.cs.meta b/System/MainWin/MainWinRightBottomGrid.cs.meta
similarity index 75%
copy from System/MainInterfacePanel/SkillContainerResetTimer.cs.meta
copy to System/MainWin/MainWinRightBottomGrid.cs.meta
index 6436866..4acc764 100644
--- a/System/MainInterfacePanel/SkillContainerResetTimer.cs.meta
+++ b/System/MainWin/MainWinRightBottomGrid.cs.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: cacea0d413c9c3d4baee55316ebd32d0
-timeCreated: 1528968656
+guid: ab1b3e0a09c06cc4284db7a143bb7a73
+timeCreated: 1553777994
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0