1 parent a376677 commit 994e47eCopy full SHA for 994e47e
1 file changed
README.md
@@ -1,5 +1 @@
1
-<<<<<<< HEAD
2
My test website
3
-=======
4
-# codzal.github.com
5
->>>>>>> b4eff7a0bbdd0e6d493e2f67b921beb604c6c769
0 commit comments