Merge pull request 'branch2-合并到develop' (#3 ) from branch2 into develop

修改branch2
修改branch2中的hello.txt
1 changed files with 1 additions and 1 deletions
--- a/hello.txt
+++ b/hello.txt
@ -1,4 +1,4 @@
 hello lyy
 hello222
-branch1修改
+新增branch2且加****
Author	SHA1	Message	Date
mjev3fkmu	da6c7a3e44	Merge pull request 'branch2-合并到develop' (#3 ) from branch2 into develop	1 year ago
Luoyuanyuan	f6af7125a5	修改branch2	1 year ago
Luoyuanyuan	22a0ddc20e	修改branch2中的hello.txt	1 year ago
Luoyuanyuan	e538924ad9	Merge branch 'branch2' of https://bdgit.educoder.net/mjev3fkmu/git_test_lyy into branch2	1 year ago
Luoyuanyuan	fc762bf06f	修改branch2	1 year ago
Luoyuanyuan	3319d3cdf9	修改branch2	1 year ago
Luoyuanyuan	d5ae4e47b9	Merge branch 'develop' of https://bdgit.educoder.net/mjev3fkmu/git_test_lyy into branch2 # Conflicts: # hello.txt	1 year ago
Luoyuanyuan	f5a74fc790	branch2修改	1 year ago