diff --git a/merge_conflict.txt b/merge_conflict.txt index 810f6ed..8477ae8 100644 --- a/merge_conflict.txt +++ b/merge_conflict.txt @@ -1,3 +1,3 @@ This is line 1. -This is line 2. +This is line two. This is line 3.