mirror of
https://github.com/rust-lang/rust
synced 2024-10-04 15:50:51 +00:00
Do not automatically merge Cargo.lock
This commit is contained in:
parent
632ad19135
commit
77faf79c0e
1
.gitattributes
vendored
1
.gitattributes
vendored
|
@ -7,3 +7,4 @@
|
|||
src/etc/installer/gfx/* binary
|
||||
*.woff binary
|
||||
src/vendor/** -text
|
||||
Cargo.lock -merge
|
||||
|
|
Loading…
Reference in a new issue