diff --git a/1.txt b/1.txt index 3457b98..9ed5048 100644 --- a/1.txt +++ b/1.txt @@ -5,3 +5,4 @@ branch2 ======= branch2 >>>>>>> branch2 +pull