From 29e3ddcfa7109e29f50657b53538df27892bdcfc Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 26 Jun 2023 11:42:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_opencond.json | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json
index baded51bd..e5cbac43b 100644
--- a/bin/json/game_opencond.json
+++ b/bin/json/game_opencond.json
@@ -1727,13 +1727,8 @@
     },
     "main": [
       {
-<<<<<<< HEAD
         "key": 2,
         "param": 1100208
-=======
-        "key": 1,
-        "param": 1
->>>>>>> a3bec23bf241b6dd679796965c80c09d855ce741
       }
     ],
     "wkqbx": 0,
@@ -1755,13 +1750,8 @@
     },
     "main": [
       {
-<<<<<<< HEAD
         "key": 2,
         "param": 1100504
-=======
-        "key": 1,
-        "param": 1
->>>>>>> a3bec23bf241b6dd679796965c80c09d855ce741
       }
     ],
     "wkqbx": 0,
@@ -1783,13 +1773,8 @@
     },
     "main": [
       {
-<<<<<<< HEAD
         "key": 2,
         "param": 1100504
-=======
-        "key": 1,
-        "param": 1
->>>>>>> a3bec23bf241b6dd679796965c80c09d855ce741
       }
     ],
     "wkqbx": 0,
@@ -1811,13 +1796,8 @@
     },
     "main": [
       {
-<<<<<<< HEAD
         "key": 2,
         "param": 1100604
-=======
-        "key": 1,
-        "param": 1
->>>>>>> a3bec23bf241b6dd679796965c80c09d855ce741
       }
     ],
     "wkqbx": 0,
@@ -1839,13 +1819,8 @@
     },
     "main": [
       {
-<<<<<<< HEAD
         "key": 2,
         "param": 1100608
-=======
-        "key": 1,
-        "param": 1
->>>>>>> a3bec23bf241b6dd679796965c80c09d855ce741
       }
     ],
     "wkqbx": 0,