Merge branch 'develop' of https://bdgit.educoder.net/mjev3fkmu/git_test_lyy into branch2

# Conflicts: # hello.txt
4 months ago · d5ae4e47b9
parent f5a74fc790 4fb1465acd
commit d5ae4e47b9
2 changed files with 8 additions and 0 deletions
--- a/hello.txt
+++ b/hello.txt
@ -1,4 +1,9 @@
 hello lyy
 hello222

+<<<<<<< HEAD
 branch2修改
+branch2修改
+=======
+branch1修改
+>>>>>>> 4fb1465acd7b72ac470ae8307e4fbef0bf88df10
--- a/hello222.txt
+++ b/hello222.txt
@ -0,0 +1,3 @@
+hello222
+
+添加一行-develop