From f47ea60f59e0b2b8601583351e269151237c6708 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 28 一月 2019 11:20:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into SpringFestival

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

diff --git a/Core/GameEngine/Model/Config/JadeDynastyBossConfig.cs.meta b/Core/GameEngine/Model/Config/JadeDynastyBossConfig.cs.meta
index 69ebe16..8335861 100644
--- a/Core/GameEngine/Model/Config/JadeDynastyBossConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/JadeDynastyBossConfig.cs.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: bc9f70989c6d3344aad5bd0dbda7bc2b
-timeCreated: 1547804881
+timeCreated: 1548302334
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0