Ywoosang

eighth

Showing 1 changed file with 1 additions and 3 deletions
......@@ -3,7 +3,5 @@ echo "third"
echo "fourth"
echo "fifth"
echo "sixth"
<<<<<<< HEAD
=======
echo "seventh"
>>>>>>> 4e8bedb... seventh
echo "eighth"
\ No newline at end of file
......