From 31c2cebbccba45a00a755981dd6d0cdd0a0459e9 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 14 八月 2018 17:28:38 +0800
Subject: [PATCH] Merge branch 'master' into leonard

---
 Assets/Resources/ScriptableObject/Config/VersionConfig.asset.meta |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Assets/Resources/ScriptableObject/Config/VersionConfig.asset.meta b/Assets/Resources/ScriptableObject/Config/VersionConfig.asset.meta
index 53a08d7..e80fd5b 100644
--- a/Assets/Resources/ScriptableObject/Config/VersionConfig.asset.meta
+++ b/Assets/Resources/ScriptableObject/Config/VersionConfig.asset.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 5ffba793fcd073b4ab51e7b6c397aabf
-timeCreated: 1526993731
+timeCreated: 1533544751
 licenseType: Pro
 NativeFormatImporter:
   mainObjectFileID: 11400000

--
Gitblit v1.8.0