Merge branch 'lixihang_branch'

# Conflicts: # doc/222.txt
2 years ago · 0d51d2991e
parent 8e88f27f62 923773b165
commit 0d51d2991e
1 changed files with 5 additions and 1 deletions
--- a/doc/222.txt
+++ b/doc/222.txt
@ -1 +1,5 @@
-branch2 testmain   abc
+<<<<<<< HEAD
+branch2 testmain   abc
+=======
+branch2 testbranch  bcd
+>>>>>>> lixihang_branch