diff options
author | Igor Aleksanov <[email protected]> | 2020-08-14 05:34:07 +0100 |
---|---|---|
committer | Igor Aleksanov <[email protected]> | 2020-08-14 05:34:07 +0100 |
commit | c26c911ec1e6c2ad1dcb7d155a6a1d528839ad1a (patch) | |
tree | 7cff36c38234be0afb65273146d8247083a5cfeb /.gitattributes | |
parent | 3c018bf84de5c693b5ee1c6bec0fed3b201c2060 (diff) | |
parent | f1f73649a686dc6e6449afc35e0fa6fed00e225d (diff) |
Merge branch 'master' into add-disable-diagnostics
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 |