From cd592e1450f84c11117dcc7f3c0c664804e15669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=9D=E9=98=B3=20=E9=97=AB?= <yanchaoyang@xinje.cc>
Date: Tue, 15 Jul 2025 19:15:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=20'3.txt'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 3.txt | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 3.txt

diff --git a/3.txt b/3.txt
deleted file mode 100644
index 1c533aa..0000000
--- a/3.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-<<<<<<< HEAD
-33
-33
-=======
-3333
->>>>>>> parent of 48fb98a (1)
-456
\ No newline at end of file