From 3c4f815ab841fcbfeaa3cee56923ec20e089af7a Mon Sep 17 00:00:00 2001
From: BrokenFire <seb6596@gmail.com>
Date: Sun, 18 Feb 2018 12:21:12 +0100
Subject: [PATCH] Adding gitattributes

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

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..6d99763
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+Jenkinsfile merge=ours