From 4737756c96243cf40e45f0f19339c90c578c3a69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=BF=97=E5=98=89?= <282227179@qq.com>
Date: Wed, 25 Sep 2024 22:55:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=20dev.txt=20=E5=92=8C=20test?=
 =?UTF-8?q?.txt=20=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dev.txt  | 5 -----
 test.txt | 1 -
 2 files changed, 6 deletions(-)
 delete mode 100644 dev.txt
 delete mode 100644 test.txt

diff --git a/dev.txt b/dev.txt
deleted file mode 100644
index 71a4030..0000000
--- a/dev.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-<<<<<<< HEAD
-dev分支
-=======
-dev分
->>>>>>> dev
diff --git a/test.txt b/test.txt
deleted file mode 100644
index 56a6051..0000000
--- a/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file