user2 added some text

diff --git a/test1.txt b/test1.txt
index 662db96c966bdcb66a1a206b0166652489a64538..1a3d7fc711a6c034d6c76c5dde8cdded1c946140 100644 (file)
--- a/test1.txt
+++ b/test1.txt
@@ -1,4 +1,4 @@
-This will be my test file
+This will be my test file. User2 has added some text. 
 
 The second line will be the one that should trigger a conflict.