Link a linking issue

[rust.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index f0b1c67bd0fdd22c92f1498e14e4174772892f5d..a7de7ce85593c140267bd3bafa3812859d8f259f 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,7 +8,7 @@
 src/etc/installer/gfx/* binary
 *.woff binary
 src/vendor/** -text
-Cargo.lock -merge linguist-generated=false
+Cargo.lock linguist-generated=false
 
 # Older git versions try to fix line endings on images, this prevents it.
 *.png binary