diff --git a/merge.txt b/merge.txt index 8232393..02fc081 100644 --- a/merge.txt +++ b/merge.txt @@ -1 +1,2 @@ -# created new merge file \ No newline at end of file +# created new merge file +# added a second line for this file \ No newline at end of file