Merge branch 'huanyi_branch' of https://bdgit.educoder.net/peucv59zg/git-test into huanyi_branch

# Conflicts: # doc/1.txt
2 months ago · 07f2323a24
parent 7c574fed2f b00145a366
commit 07f2323a24
1 changed files with 5 additions and 1 deletions
--- a/doc/1.txt
+++ b/doc/1.txt
@ -1,2 +1,6 @@
+<<<<<<< HEAD
 111
 pull-request
+=======
+111
+>>>>>>> b00145a3663772c7987d4e7a127975bf64bafc43