修改branch2

4 months ago · 3319d3cdf9
parent d5ae4e47b9
commit 3319d3cdf9
1 changed files with 1 additions and 6 deletions
--- a/hello.txt
+++ b/hello.txt
@ -1,9 +1,4 @@
 hello lyy
 hello222

-<<<<<<< HEAD
-branch2修改
-branch2修改
-=======
-branch1修改
->>>>>>> 4fb1465acd7b72ac470ae8307e4fbef0bf88df10
+新增branch2