diff --git a/MergeConflictFile.txt b/MergeConflictFile.txt index 94c94ea..3675882 100644 --- a/MergeConflictFile.txt +++ b/MergeConflictFile.txt @@ -1,2 +1,3 @@ Initial Phrase (I added this bit online!) (and I added this bit on my local) +re \ No newline at end of file diff --git a/newfile.txt b/newfile.txt new file mode 100644 index 0000000..e69de29