diff --git a/.gitattributes b/.gitattributes index ca7762f3ab2..8073c8cd019 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ /dist/* binary -/package-lock.json binary \ No newline at end of file +/package-lock.json merge=binary