From 788de3fdfa8fd193ae2e1d374aa0587fc91221fb Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 15 十月 2018 15:13:26 +0800
Subject: [PATCH] Merge branch 'master' into 3687天赋功能

---
 Utility/DebugMousePos.cs.meta |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Core/GameEngine/Model/Config/BlastFurnaceLVConfig.cs.meta b/Utility/DebugMousePos.cs.meta
similarity index 68%
copy from Core/GameEngine/Model/Config/BlastFurnaceLVConfig.cs.meta
copy to Utility/DebugMousePos.cs.meta
index e3a18b2..8bc5bcc 100644
--- a/Core/GameEngine/Model/Config/BlastFurnaceLVConfig.cs.meta
+++ b/Utility/DebugMousePos.cs.meta
@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 1bbbc87171e60f949bb6b7572c73fa38
-timeCreated: 1515213620
-licenseType: Pro
+guid: 6162cab73fd1bea43b8c540484a634f3
+timeCreated: 1539425015
+licenseType: Free
 MonoImporter:
   serializedVersion: 2
   defaultReferences: []

--
Gitblit v1.8.0