From 4a9ead65814f34aac8d8849ab1ee7754b7575761 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 19 十二月 2018 16:27:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Cross_Server

---
 Lua/Gen/XLuaGenAutoRegister.cs.meta |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Lua/Gen/XLuaGenAutoRegister.cs.meta b/Lua/Gen/XLuaGenAutoRegister.cs.meta
index f18176e..a2cc343 100644
--- a/Lua/Gen/XLuaGenAutoRegister.cs.meta
+++ b/Lua/Gen/XLuaGenAutoRegister.cs.meta
@@ -1,6 +1,10 @@
 fileFormatVersion: 2
 guid: 11479d6613f53454b9f092ed34c058f8
+<<<<<<< HEAD
 timeCreated: 1544413150
+=======
+timeCreated: 1545203726
+>>>>>>> origin/master
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0