2 changed files with 2 additions and 7 deletions
--- a/doc/111.txt
+++ b/doc/111.txt
@ -1,2 +1 @@
-111
-main
+111
--- a/doc/222.txt
+++ b/doc/222.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-branch2 testmain   abc
-=======
-branch2 testbranch  bcd
->>>>>>> lixihang_branch
+branch2 testbranch  bcd