From 0eea31bde3a2c5dd12ef4dfaec95c1e4d498a786 Mon Sep 17 00:00:00 2001
From: chenxingzhi <1721823980@qq.com>
Date: Fri, 12 Nov 2021 19:03:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E9=81=97=E8=BF=B9?=
 =?UTF-8?q?=E5=85=B3=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/resource/jsons/dic_zyz_gk_branch.json | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/shared/resource/jsons/dic_zyz_gk_branch.json b/shared/resource/jsons/dic_zyz_gk_branch.json
index 31e6a7524..dab9d0745 100755
--- a/shared/resource/jsons/dic_zyz_gk_branch.json
+++ b/shared/resource/jsons/dic_zyz_gk_branch.json
@@ -467,12 +467,8 @@
     {
         "war_id": 2061,
         "dispatchJsonId": 9601,
-<<<<<<< Updated upstream
-        "bg_img_id": 9261,
-=======
         "bg_img": 9261,
         "mapid": 9261,
->>>>>>> Stashed changes
         "script_id": "R_9601&S_9601&RE_9601",
         "fixReward": "&",
         "conditionReward": "31001&10000&0|31002&200&0|11002&14&0|22001&2&0",
@@ -502,12 +498,8 @@
     {
         "war_id": 2062,
         "dispatchJsonId": 9602,
-<<<<<<< Updated upstream
-        "bg_img_id": 9262,
-=======
         "bg_img": 9262,
         "mapid": 9262,
->>>>>>> Stashed changes
         "script_id": "R_9602&S_9602&RE_9602",
         "fixReward": "&",
         "conditionReward": "31001&10000&0|31002&200&0|11002&14&0|22001&2&0",
@@ -537,12 +529,8 @@
     {
         "war_id": 2063,
         "dispatchJsonId": 9603,
-<<<<<<< Updated upstream
-        "bg_img_id": 9263,
-=======
         "bg_img": 9263,
         "mapid": 9263,
->>>>>>> Stashed changes
         "script_id": "R_9603&S_9603&RE_9603",
         "fixReward": "&",
         "conditionReward": "31001&10000&0|31002&200&0|11002&14&0|22001&2&0",