diff options
| author | Dmitry <[email protected]> | 2020-08-14 19:32:05 +0100 |
|---|---|---|
| committer | Dmitry <[email protected]> | 2020-08-14 19:32:05 +0100 |
| commit | 178c3e135a2a249692f7784712492e7884ae0c00 (patch) | |
| tree | ac6b769dbf7162150caa0c1624786a4dd79ff3be /.gitattributes | |
| parent | 06ff8e6c760ff05f10e868b5d1f9d79e42fbb49c (diff) | |
| parent | c2594daf2974dbd4ce3d9b7ec72481764abaceb5 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 4cd50e481..7c2f752d6 100644 --- a/.gitattributes +++ b/.gitattributes | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | * text=auto eol=lf | 1 | * text=auto eol=lf |
| 2 | crates/ra_syntax/test_data/** -text eof=LF | 2 | crates/syntax/test_data/** -text eof=LF |
| 3 | # Older git versions try to fix line endings on images, this prevents it. | 3 | # Older git versions try to fix line endings on images, this prevents it. |
| 4 | *.png binary | 4 | *.png binary |
| 5 | *.jpg binary | 5 | *.jpg binary |