From 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 20:05:36 +0800
Subject: [PATCH] Merge branch 'master' into leonard

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

diff --git a/Core/GameEngine/Model/Config/ContactConfig.cs.meta b/Core/GameEngine/Model/Config/ContactConfig.cs.meta
index f33beaa..f66daa5 100644
--- a/Core/GameEngine/Model/Config/ContactConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/ContactConfig.cs.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 8ecbb84f62ba262448b74256777f91ec
-timeCreated: 1539586414
+timeCreated: 1540450970
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0