committing the changes by user 2 that make the conflict

diff --git a/test1.txt b/test1.txt
index a23c3ed7a461bcb79c4aacf631f8e4d92e8a662e..c14422ec8ea0a3648e38bd0d5cfd4a539797d202 100644 (file)
--- a/test1.txt
+++ b/test1.txt
@@ -1,5 +1,5 @@
 This will be my test file. User2 has added some text. User2 add some more text.
 
-The second line will be the one that should trigger a conflict.
+The second line USER2 ADDED TEXT will be the one that should trigger a conflict.
 
 The thrid line will remain unchanged.