From 57503731adcdbd05728444e9902ed2292990fe79 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 21 十二月 2018 11:31:26 +0800
Subject: [PATCH] 5398 子 【开发】【1.4】跨服竞技场 / 【前端】【1.4】跨服竞技场开发

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

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

--
Gitblit v1.8.0