From a03f020ad58246e1c6eee57ae8a85f8484b92930 Mon Sep 17 00:00:00 2001
From: wangbo_stu <1157323794@qq.com>
Date: Mon, 21 Sep 2026 21:12:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E5=86=85=E4=BF=A9=E4=BF=A9?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=B8=80=E6=AC=A1=E5=86=B2=E7=AA=81=E7=9A=84?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E5=B9=B6=E6=88=AA=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/test_1.txt b/test_1.txt
index ffefe84..633a8e3 100644
--- a/test_1.txt
+++ b/test_1.txt
@@ -1,2 +1,2 @@
 dadsad
-dsdsad
\ No newline at end of file
+wangbo修改的冲突代码
\ No newline at end of file