Stabilize IP associated constants

[rust.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 2b4f3d472632a356d67f5a01cdf7daa047a5f002..b223c8ac5fb841ed167a8c376eb1b6d5753ac0ec 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,7 +4,8 @@
 *.cpp rust
 *.h rust
 *.rs rust
+*.fixed linguist-language=Rust
 src/etc/installer/gfx/* binary
 *.woff binary
 src/vendor/** -text
-Cargo.lock -merge
+Cargo.lock -merge linguist-generated=false