new

2 changed files with 3 additions and 3 deletions
--- a/doc/new.txt
+++ b/doc/new.txt
--- a/冲突.txt
+++ b/冲突.txt
@ -1,3 +1,3 @@
-111111
-222222
-main
+11111
+22222
+lihaoyi