Merge branch 'lixihang_branch'

# Conflicts: # doc/222.txt
1
1 changed files with 5 additions and 1 deletions
--- a/doc/222.txt
+++ b/doc/222.txt
@ -1 +1,5 @@
-branch2 testmain
+<<<<<<< HEAD
+branch2 testmain   abc
+=======
+branch2 testbranch  bcd
+>>>>>>> lixihang_branch
Author	SHA1	Message	Date
lixihang	0d51d2991e	Merge branch 'lixihang_branch' # Conflicts: # doc/222.txt	2 years ago
lixihang	923773b165	1	2 years ago
lixihang	8e88f27f62	1	2 years ago
lixihang	3b406018f6	1	2 years ago
lixihang	41b476d38e	2	2 years ago