From a6fe01a79b6dd6fa4cb927229cf152c6c48dc184 Mon Sep 17 00:00:00 2001
From: chenxingzhi <1721823980@qq.com>
Date: Thu, 22 Apr 2021 15:17:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=AD=A6=E5=B0=86?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/resource/jsons/dic_zyz_hero.json | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/shared/resource/jsons/dic_zyz_hero.json b/shared/resource/jsons/dic_zyz_hero.json
index 187571d08..07b17422a 100644
--- a/shared/resource/jsons/dic_zyz_hero.json
+++ b/shared/resource/jsons/dic_zyz_hero.json
@@ -2669,28 +2669,17 @@
     },
     {
         "heroId": 59,
-<<<<<<< Updated upstream
-        "spineName": "wangyue",
-        "rSpineName": "&",
-        "name": "童渊",
-        "face_id": "wangyue",
-=======
         "spineName": "tongyuan",
         "rSpineName": "&",
         "name": "童渊",
         "face_id": "tongyuan",
->>>>>>> Stashed changes
         "quality": 3,
         "initialStars": 3,
         "pieceCount": 100,
         "camp": 4,
         "area": 0,
         "cost": 0,
-<<<<<<< Updated upstream
-        "jobid": 1,
-=======
         "jobid": 6,
->>>>>>> Stashed changes
         "skill": 0,
         "pieceId": 21057,
         "hp": 100,
@@ -2723,8 +2712,6 @@
         "atkSpineEffect": "dunqi",
         "showinRecruit": "0&",
         "recruit": "0&"
-<<<<<<< Updated upstream
-=======
     },
     {
         "heroId": 60,
@@ -2817,7 +2804,6 @@
         "atkSpineEffect": "dunqi",
         "showinRecruit": "0&",
         "recruit": "0&"
->>>>>>> Stashed changes
     },
     {
         "heroId": 301,