From c71c0432fbed74140102e0d97f5a321fae766acc Mon Sep 17 00:00:00 2001
From: Christopher Hiller <boneskull@boneskull.com>
Date: Fri, 7 Apr 2023 11:24:34 -0700
Subject: [PATCH] chore: update .gitattributes - normalize EoL characters -
 make `package-lock.json` conflicts easier to deal w/

---
 .gitattributes | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index fe25383fc..d5f1fc261 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,6 @@
+* text=auto eol=lf
+
 test/assets/*.app/** merge=binary
+
+# Handle as a text file but merge as binary.
+package-lock.json merge=binary