From 52a5fe24455a765fa05ac2fcd35731add4f4c945 Mon Sep 17 00:00:00 2001
From: Logan Allen <loganallc@gmail.com>
Date: Mon, 14 Jun 2021 16:31:47 -0500
Subject: [PATCH] gitattributes: treat package-lock.json files as binary

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

diff --git a/.gitattributes b/.gitattributes
index 2d2703b49..74bf35190 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,4 @@
 bin/* filter=lfs diff=lfs merge=lfs -text
 bin/*/* filter=lfs diff=lfs merge=lfs -text
 pkg/arvo/**/*.css binary
+**/package-lock.json binary merge=theirs