diff --git a/mergetest.txt b/mergetest.txt deleted file mode 100644 index 9daeafb..0000000 --- a/mergetest.txt +++ /dev/null @@ -1 +0,0 @@ -test