diff options
| author | Zac Pullar-Strecker <[email protected]> | 2020-08-24 10:19:53 +0100 |
|---|---|---|
| committer | Zac Pullar-Strecker <[email protected]> | 2020-08-24 10:20:13 +0100 |
| commit | 7bbca7a1b3f9293d2f5cc5745199bc5f8396f2f0 (patch) | |
| tree | bdb47765991cb973b2cd5481a088fac636bd326c /.gitattributes | |
| parent | ca464650eeaca6195891199a93f4f76cf3e7e697 (diff) | |
| parent | e65d48d1fb3d4d91d9dc1148a7a836ff5c9a3c87 (diff) | |
Merge remote-tracking branch 'upstream/master' into 503-hover-doc-links
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 |