diff options
| author | Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de> | 2017-12-06 15:41:03 +0100 |
|---|---|---|
| committer | Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de> | 2017-12-06 15:41:46 +0100 |
| commit | 77faf79c0e2b8cf52a4ce9d3aaece794674ac2ae (patch) | |
| tree | 3e6c8706b15b0f55a97c013f8c42ec2c585b331c /.gitattributes | |
| parent | 632ad19135a1f38c42761270ffc8a0d977b1db4c (diff) | |
| download | rust-77faf79c0e2b8cf52a4ce9d3aaece794674ac2ae.tar.gz rust-77faf79c0e2b8cf52a4ce9d3aaece794674ac2ae.zip | |
Do not automatically merge Cargo.lock
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index e737c7946ef..2b4f3d47263 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,3 +7,4 @@ src/etc/installer/gfx/* binary *.woff binary src/vendor/** -text +Cargo.lock -merge |