From cb7bbf58ccf08a47ce2b0123e24b080190caf539 Mon Sep 17 00:00:00 2001
From: Gary Macbook <gsteele13@gmail.com>
Date: Wed, 18 Nov 2015 23:21:52 +0100
Subject: [PATCH] Adding first test file

---
 test1.txt | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 test1.txt

diff --git a/test1.txt b/test1.txt
new file mode 100644
index 0000000..662db96
--- /dev/null
+++ b/test1.txt
@@ -0,0 +1,5 @@
+This will be my test file
+
+The second line will be the one that should trigger a conflict.
+
+The thrid line will remain unchanged.
-- 
2.25.1