From 6d5b5006ad9cdf1021adbd54b504302375311716 Mon Sep 17 00:00:00 2001
From: Wuxiaowen <2371806495@qq.com>
Date: Thu, 10 Jul 2025 12:31:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8fenzhi4=E6=B7=BB=E5=8A=A0conflict?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conflict.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 conflict.txt

diff --git a/conflict.txt b/conflict.txt
new file mode 100644
index 0000000..cd24ed3
--- /dev/null
+++ b/conflict.txt
@@ -0,0 +1,2 @@
+这是fenzhi4分支的内容
+第二行内容
\ No newline at end of file