diff --git a/hello.txt b/hello.txt index 87949fa..bd5591c 100644 --- a/hello.txt +++ b/hello.txt @@ -1,9 +1,4 @@ hello lyy hello222 -<<<<<<< HEAD -branch2修改 -branch2修改 -======= -branch1修改 ->>>>>>> 4fb1465acd7b72ac470ae8307e4fbef0bf88df10 +新增branch2