diff --git a/file_1.txt b/file_1.txt index 0257d91..323e7be 100644 --- a/file_1.txt +++ b/file_1.txt @@ -7,3 +7,4 @@ Have a blessed day! This line should conflict with a different commit. Adding a new line, still nothing to see. Okay one more line. +And this one but that's it!