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 New Issue
Block a user