From 8ed1e54f0144c1f470b8ef56548b051026e5192a Mon Sep 17 00:00:00 2001
From: Thorsten Sommer <service@sommer-engineering.com>
Date: Sat, 15 Sep 2018 13:40:42 +0200
Subject: [PATCH] Added git attributes for JetBrain files

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

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..dafc81f
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+.idea/** merge=ignore
\ No newline at end of file