From 996517797f4e1c2b112367d9ae1810717796fa73 Mon Sep 17 00:00:00 2001
From: yajun <luyajun@trgame.cn>
Date: Tue, 17 May 2022 18:23:38 +0800
Subject: [PATCH] =?UTF-8?q?shoplist=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/resource/jsons/dic_zyz_shopList.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/shared/resource/jsons/dic_zyz_shopList.json b/shared/resource/jsons/dic_zyz_shopList.json
index 339497995..a97476996 100644
--- a/shared/resource/jsons/dic_zyz_shopList.json
+++ b/shared/resource/jsons/dic_zyz_shopList.json
@@ -37,11 +37,7 @@
         "shopicon": "shoptubiaozi_shizhuang",
         "typeid": "7&12",
         "moneyid": "40006&40014",
-<<<<<<< Updated upstream
-        "openLimit": "20&"
-=======
         "openLimit": "5&"
->>>>>>> Stashed changes
     },
     {
         "shopid": 6,