diff --git a/merge.txt b/merge.txt index 1912847..270c11c 100644 --- a/merge.txt +++ b/merge.txt @@ -4,4 +4,4 @@ # added a fourth line for this file # added a fifth line for this file # added a sixth line for this file -# changed to new bugReport branch \ No newline at end of file +# changed to new mergeFile branch