From a77090b7ed3b53e8583dbfe4d3bb651fae365108 Mon Sep 17 00:00:00 2001 From: Gary Macbook Date: Wed, 18 Nov 2015 23:56:55 +0100 Subject: [PATCH] committing the changes by user 2 that make the conflict --- test1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test1.txt b/test1.txt index a23c3ed..c14422e 100644 --- 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. -- 2.25.1