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