From a974a2621a6dcb90b8fe52b23d075814873c0960 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 23 十月 2018 20:53:49 +0800
Subject: [PATCH] Merge branch 'master' into leonard

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

diff --git a/Core/GameEngine/Model/Config/JobSetupConfig.cs.meta b/Core/GameEngine/Model/Config/JobSetupConfig.cs.meta
index d951654..abd0a5a 100644
--- a/Core/GameEngine/Model/Config/JobSetupConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/JobSetupConfig.cs.meta
@@ -1,7 +1,7 @@
 fileFormatVersion: 2
 guid: 027514b321a62b343897e7bda10272ee
-timeCreated: 1529458253
-licenseType: Pro
+timeCreated: 1540189086
+licenseType: Free
 MonoImporter:
   serializedVersion: 2
   defaultReferences: []

--
Gitblit v1.8.0