diff --git a/test.md b/test.md deleted file mode 100644 index 701856f..0000000 --- a/test.md +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -iiiii -======= -iiii ->>>>>>> 21f7ada7c07e4da7133dd964e0ec4e37894e512f