From 441b4de29847152f9ca12f0a3bc5f61c3f78a973 Mon Sep 17 00:00:00 2001
From: Shu-Ying <1754798088@qq.com>
Date: Thu, 13 Aug 2026 17:31:54 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=20=E8=A7=A3=E5=86=B3=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dist/manifest.json | 17 -----------------
 update.txt         |  3 ---
 2 files changed, 20 deletions(-)

diff --git a/dist/manifest.json b/dist/manifest.json
index d63e750..3e9db24 100644
--- a/dist/manifest.json
+++ b/dist/manifest.json
@@ -1,16 +1,9 @@
 {
   "version": "2.0.1.0",
-<<<<<<< HEAD
   "generated_at": "2026-08-13T09:28:20.285659+00:00",
   "algorithm": "sha256",
   "file_count": 276,
   "folder_sha256": "ab1c54fd1136e50f96b2cec7a419fd22bde8cf8df8f0e40dab842f0d4fb3aaec",
-=======
-  "generated_at": "2026-08-13T09:24:08.169785+00:00",
-  "algorithm": "sha256",
-  "file_count": 276,
-  "folder_sha256": "2c4cb3f294d31638f276b0f37607ea30877b309307e5ee1b87d85052bf5ed663",
->>>>>>> b256c0f8e4446bd82892d04d45e71fd8fd7cd2a4
   "core": [
     "extension.js",
     "menu.js",
@@ -1299,13 +1292,8 @@
       "sha256": "7594c68dd1308de5fd13ea7e76fde665a296400a7505b32054bf0d149986bb05"
     },
     "update.txt": {
-<<<<<<< HEAD
       "size": 2901,
       "sha256": "6ce45269f253f8fb42665ba3fc14a1ac8a5e48d60b9cb5c6fe5beccb9336cc2f"
-=======
-      "size": 1763,
-      "sha256": "0c8d90ecb09de1f92bf73ffa444d754fe1a8614029ae3b91d515c35f4863c2b5"
->>>>>>> b256c0f8e4446bd82892d04d45e71fd8fd7cd2a4
     },
     "voices.js": {
       "size": 1711,
@@ -2820,13 +2808,8 @@
       },
       "update.txt": {
         "type": "file",
-<<<<<<< HEAD
         "size": 2901,
         "sha256": "6ce45269f253f8fb42665ba3fc14a1ac8a5e48d60b9cb5c6fe5beccb9336cc2f"
-=======
-        "size": 1763,
-        "sha256": "0c8d90ecb09de1f92bf73ffa444d754fe1a8614029ae3b91d515c35f4863c2b5"
->>>>>>> b256c0f8e4446bd82892d04d45e71fd8fd7cd2a4
       },
       "voices.js": {
         "type": "file",
diff --git a/update.txt b/update.txt
index 702c6ad..5539d75 100644
--- a/update.txt
+++ b/update.txt
@@ -19,7 +19,6 @@
 "修复过关后行动顺序异常，当前角色回合结束后将行动权交给其下家",
 "调整天书开局保护的伤害结算顺序，优先结算其他免伤和减伤效果",
 "修复生成更新清单时会覆盖原有remove和removeDirectories内容的问题",
-<<<<<<< HEAD
 "-----< 2.0.0.9 改动 >-----",
 "新增可以自定义虚拟偶像随机助战池功能",
 "现在过关奖励提供的技能池会过滤武将牌上的技能",
@@ -39,5 +38,3 @@
 "修复了一个BUG，该BUG会导致进入下关时BOSS的初始牌会被技能检索",
 "修复黄蜂技能【冥虫】无法正常发动的BUG",
 "修正司马懿AI向其友方发动【反馈】【狼顾】的问题",
-=======
->>>>>>> b256c0f8e4446bd82892d04d45e71fd8fd7cd2a4