OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not automatically merge Cargo.lock

This commit is contained in:
Oliver Schneider 2017-12-06 15:41:03 +01:00
parent 632ad19135
commit 77faf79c0e
No known key found for this signature in database
GPG Key ID: A69F8D225B3AD7D9
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -7,3 +7,4 @@
src/etc/installer/gfx/* binary
*.woff binary
src/vendor/** -text
Cargo.lock -merge