1 changed files with 1 additions and 3 deletions
--- a/doc/1.txt
+++ b/doc/1.txt
@ -1,3 +1 @@
-合并后：第一次修改
-dingshuxian修改
-main第一次修改
+main第一次修改