From 7514490604807f0a5a1760ada8be89c1a7fa6605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=89=AC=E5=9D=A4?= <906176381@qq.com>
Date: Mon, 21 Sep 2026 20:42:59 +0800
Subject: [PATCH] =?UTF-8?q?akun=E4=BF=AE=E6=94=B9=E4=BA=86=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conflict_demo.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conflict_demo.txt b/conflict_demo.txt
index 753db7a..f43c0db 100644
--- a/conflict_demo.txt
+++ b/conflict_demo.txt
@@ -1 +1 @@
-这是akun修改的内容
+这是akun修改的冲突行