From 35f914f938608fe82d267f0072f33c531e88de8f Mon Sep 17 00:00:00 2001
From: zino <zino@zinomedia.de>
Date: Sun, 23 May 2021 19:51:05 +0200
Subject: [PATCH] gitattributes not needed

---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index a0f17e5..2eefe2b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-package.json merge=ours
\ No newline at end of file
+#package.json merge=ours
\ No newline at end of file