From 5635d83203db4b3398d2dd0350cd207a6f3b7f89 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:43:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=8E=E5=9B=9B=E4=BF=AE=E6=94=B9=E4=BA=86?=
 =?UTF-8?q?=E5=86=B2=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 f43c0db..88daadf 100644
--- a/conflict_demo.txt
+++ b/conflict_demo.txt
@@ -1 +1 @@
-这是akun修改的冲突行
+这是李四修改的冲突行