From 801be9c60b1c7cbfebd07173274a6f00cf22580d Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Sat, 24 Mar 2018 23:05:58 +0100
Subject: [PATCH] Create .gitattributes

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

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..8dcdc753a
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Ignore version on merge
+version.json merge=ours