From 879ad1ca47f2c7ef19675e29c9f97beab9199d7d Mon Sep 17 00:00:00 2001
From: sya <1423904024@qq.com>
Date: Mon, 21 Sep 2026 21:07:20 +0800
Subject: [PATCH] 2s

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

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