From 7b7745a0d809166a71ccd0b46c5ec5e3ddd783be Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Thu, 7 May 2020 10:33:59 +0200
Subject: [PATCH] Make packages.json use the union merge strategy

Sadly, github doesn't support this (yet), so this will not affect merges via the Github WebUI.
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..3efd012
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+/packages.json merge=union