diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-15 06:01:26 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-11-15 06:01:26 +0000 |
commit | ae6a803c0a38a423f2987b04283ec27900c80f0c (patch) | |
tree | 3661632f21e1f6ac738b11c5e88672e906a7c10b /.gitattributes | |
parent | bbb022d3999b3038549ec6c309efb065231c896a (diff) | |
parent | 50825a41d8661e4a93f92c81913c675a48247037 (diff) |
Merge #2246
2246: Normalize Line Endings r=matklad a=kjeremy
Line endings with git always confuse me so let's be explicit.
In doing this I ran `git add --renormalize .` on my repo per https://help.github.com/en/github/using-git/configuring-git-to-handle-line-endings and it converted a bunch of files. I then backed it all out and ran it again and only this one `Cargo.toml` file changed so I suspect line endings are just weird.
Co-authored-by: kjeremy <[email protected]>
Diffstat (limited to '.gitattributes')
-rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 183e9b521..e749e1dc9 100644 --- a/.gitattributes +++ b/.gitattributes | |||
@@ -1,2 +1,2 @@ | |||
1 | * text=auto eol=lf | ||
1 | crates/ra_syntax/test_data/** -text eof=LF | 2 | crates/ra_syntax/test_data/** -text eof=LF |
2 | crates/ra_ide_api/src/snapshots/** -text eof=LF | ||