333

3 years ago · aa9e32654c
parent a397d6b78f
commit aa9e32654c
2 changed files with 2 additions and 3 deletions
--- a/README.md
+++ b/README.md
@ -1,2 +1,3 @@
 # git-songhp
+new branch

--- a/git.txt
+++ b/git.txt
@ -1,8 +1,6 @@
 git show
 111
-<<<<<<< HEAD
 333
-=======
 222
->>>>>>> 3ad949782ad2b22ac1b9cef7521ec0506c2e6ea7
+