修改branch2中的hello.txt

Merge branch 'branch2' of https://bdgit.educoder.net/mjev3fkmu/git_test_lyy into branch2
修改branch2
1 changed files with 2 additions and 1 deletions
--- a/hello.txt
+++ b/hello.txt
@ -1,4 +1,5 @@
 hello lyy
 hello222
-新增branch2
+新增branch2加星*******
Author	SHA1	Message	Date
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