删除 dev.txt 和 test.txt 文件

2 months ago · 4737756c96
parent b1bcc17835
commit 4737756c96
2 changed files with 0 additions and 6 deletions
--- a/dev.txt
+++ b/dev.txt
@ -1,5 +0,0 @@
-<<<<<<< HEAD
-dev分支
-=======
-dev分
->>>>>>> dev
--- a/test.txt
+++ b/test.txt
@ -1 +0,0 @@
-1