From 2f723e5320ef618985cc9ea8f71deafd3e4bec36 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 16 四月 2019 11:35:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

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

diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HAF_Merge.meta b/System/HazyRegion.meta
similarity index 66%
rename from Core/NetworkPackage/DTCFile/ServerPack/HAF_Merge.meta
rename to System/HazyRegion.meta
index 314efd1..47b33b3 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/HAF_Merge.meta
+++ b/System/HazyRegion.meta
@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 71e878ac60c49ad4f964dd2dbc725739
+guid: 3a97466d4874bbc4385441a3ac16b0df
 folderAsset: yes
-timeCreated: 1547643019
+timeCreated: 1554358777
 licenseType: Pro
 DefaultImporter:
   userData: 

--
Gitblit v1.8.0