From 22e5afeb3f7a75baededff275d88ba9ee74240a5 Mon Sep 17 00:00:00 2001
From: zino <zino@zinomedia.de>
Date: Sun, 23 May 2021 02:01:07 +0200
Subject: [PATCH] added gitattributes and driver ours

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

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