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