diff --git a/Notes.orig b/Notes.orig deleted file mode 100644 index f034b4d..0000000 --- a/Notes.orig +++ /dev/null @@ -1,6 +0,0 @@ -<<<<<<< HEAD -test commit -test commit 2 -======= -test commit ->>>>>>> aa8e536bf0c81319b1cbf92ce26cb3de3083e759