Showing
1 changed file
with
1 additions
and
3 deletions
... | @@ -3,7 +3,5 @@ echo "third" | ... | @@ -3,7 +3,5 @@ echo "third" |
3 | echo "fourth" | 3 | echo "fourth" |
4 | echo "fifth" | 4 | echo "fifth" |
5 | echo "sixth" | 5 | echo "sixth" |
6 | -<<<<<<< HEAD | ||
7 | -======= | ||
8 | echo "seventh" | 6 | echo "seventh" |
9 | ->>>>>>> 4e8bedb... seventh | 7 | +echo "eighth" |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
-
Please register or login to post a comment