From 61d5a6fd66100a3ebc9fc8235550467ce333973a Mon Sep 17 00:00:00 2001
From: MichaelOultram <MichaelOultram@users.noreply.github.com>
Date: Mon, 10 Aug 2015 00:01:12 +0100
Subject: [PATCH] Added .gitattributes file

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

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..73ec672
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+README.md merge=ours
\ No newline at end of file