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

# Conflicts: # doc/1.txt
pull-request
1 changed files with 6 additions and 1 deletions
--- a/doc/1.txt
+++ b/doc/1.txt
@ -1 +1,6 @@
-111
+<<<<<<< HEAD
+111
+ pull-request
+=======
+111
+>>>>>>> b00145a3663772c7987d4e7a127975bf64bafc43
Author	SHA1	Message	Date
胡安薏	07f2323a24	Merge branch 'huanyi_branch' of https://bdgit.educoder.net/peucv59zg/git-test into huanyi_branch # Conflicts: # doc/1.txt	2 months ago
胡安薏	7c574fed2f	pull-request	2 months ago
胡安薏	44f44048c3	111	2 months ago