From 6bf9b775fd18385db494ded584ef7258dfe4d1e8 Mon Sep 17 00:00:00 2001 From: Gary Macbook Date: Wed, 18 Nov 2015 23:53:25 +0100 Subject: [PATCH] first conflict test --- test1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test1.txt b/test1.txt index a23c3ed..21e8794 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 USER1 ADDED TEXT will be the one that should trigger a conflict. The thrid line will remain unchanged. -- 2.25.1