From 4c6d58af44cd4235501e15a78bf79674ba2fcc4a Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 15 一月 2019 10:41:31 +0800
Subject: [PATCH] Merge branch 'master' into GrowthFund

---
 Core/GameEngine/Model/Config/ModelResConfig.cs.meta |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Core/GameEngine/Model/Config/ModelResConfig.cs.meta b/Core/GameEngine/Model/Config/ModelResConfig.cs.meta
index 86b0e0b..90a9de4 100644
--- a/Core/GameEngine/Model/Config/ModelResConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/ModelResConfig.cs.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 290b3d02a826d6b4daabb2e80dfaa3ab
-timeCreated: 1544430338
+timeCreated: 1547446994
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0