From f25071907ccee8a0d9ba8f996a419fba6ce1db60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E7=A2=A7=E8=95=BE?=
 <17608254+sunbilei@user.noreply.gitee.com>
Date: Mon, 21 Sep 2026 21:47:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=E7=AC=A6=E5=8F=B7=EF=BC=8C=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/README.md b/README.md
index a6bbe05..be4e156 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1 @@
-<<<<<<< HEAD
-这是B修改的内容。
-=======
-这是A修改的内容。
->>>>>>> 7cc3e14df82d8446829b01a3aa61e664c022df10
+这是A修改的内容。这是B修改的内容。