资源：解决冲突

2021-11-17 19:23:32 +08:00
parent 47ab6b35ee
commit 80f50d0b86
1 changed files with 0 additions and 4 deletions
--- a/shared/resource/jsons/dic_zyz_mainTask.json
+++ b/shared/resource/jsons/dic_zyz_mainTask.json
@@ -27,11 +27,7 @@
        "id": 3,
        "mainTaskId": 3,
        "taskType": 41,
-<<<<<<< Updated upstream
-        "taskInfo": "奇遇10次",
-=======
        "taskInfo": "事件触发10次",
->>>>>>> Stashed changes
        "group": 1,
        "taskParam": "0&1&",
        "taskStage": 1,