diff --git a/新建文本文档.txt b/新建文本文档.txt
deleted file mode 100644
index 1e2f19f..0000000
--- a/新建文本文档.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-<<<<<<< HEAD
-ssssss
-=======
-ssss
->>>>>>> remotes/origin/devolpe_cp