From f99e6bd264cbb213fb5a160ab333226e4cff5fa1 Mon Sep 17 00:00:00 2001
From: akun <906176381@qq.com>
Date: Mon, 21 Sep 2026 20:46:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=20conflict=5Fdemo.txt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conflict_demo.txt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 conflict_demo.txt

diff --git a/conflict_demo.txt b/conflict_demo.txt
deleted file mode 100644
index c8a2007..0000000
--- a/conflict_demo.txt
+++ /dev/null
@@ -1 +0,0 @@
-Lisi wrote this line