diff --git a/.gitattributes b/.gitattributes index 2b4f3d472632a..7f25bddc06cfe 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,4 +7,4 @@ src/etc/installer/gfx/* binary *.woff binary src/vendor/** -text -Cargo.lock -merge +Cargo.lock -merge linguist-generated=false