From 8b32c3fc56ce9e478f0b05055e2f8c9a88fd3156 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 11 三月 2019 13:14:35 +0800
Subject: [PATCH] Merge branch 'master' into Equip

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

diff --git a/System/Market/PutawayItem.cs.meta b/Lua/Gen/AuctionIndexConfigWrap.cs.meta
similarity index 75%
copy from System/Market/PutawayItem.cs.meta
copy to Lua/Gen/AuctionIndexConfigWrap.cs.meta
index ef8e2e3..1eb7a18 100644
--- a/System/Market/PutawayItem.cs.meta
+++ b/Lua/Gen/AuctionIndexConfigWrap.cs.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 3e90d375cb6ec624ca467c0301e4cc56
-timeCreated: 1539935463
+guid: f67d1c1fcb503b34eb105b8e3570545e
+timeCreated: 1552276114
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0