From 063df64bc6ea196db7fc606997d55524556e0b7d Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Sun, 26 Apr 2020 18:11:29 +0100
Subject: [PATCH] Added .testfile to test merge conflicts.

---
 .testfile | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .testfile

diff --git a/.testfile b/.testfile
new file mode 100644
index 0000000..ebd7525
--- /dev/null
+++ b/.testfile
@@ -0,0 +1 @@
+Bar