From 9e70f11aaf3a9e8db1b3e15aaed0cb13f41073dd Mon Sep 17 00:00:00 2001 From: Gary Macbook Date: Wed, 18 Nov 2015 23:49:29 +0100 Subject: [PATCH] adding more text --- test1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test1.txt b/test1.txt index 1a3d7fc..a23c3ed 100644 --- a/test1.txt +++ b/test1.txt @@ -1,4 +1,4 @@ -This will be my test file. User2 has added some text. +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. -- 2.25.1