Change Windows-style CRLF line terminators to LF#649
Merged
brunto merged 1 commit intoLINCnil:masterfrom Aug 26, 2022
Merged
Conversation
Collaborator
|
@DimitriPapadopoulos too many conflicts in this PR, I can't merge it! |
DimitriPapadopoulos
force-pushed
the
dos2unix
branch
2 times, most recently
from
daf29d4 to
c8990cf
Compare
Contributor
Author
|
@brunto Rebased on master. |
DimitriPapadopoulos
force-pushed
the
dos2unix
branch
from
c8990cf to
6c9fa6a
Compare
I have nothing against CRLF, but I am all for consistency. All other files end lines with LF.
DimitriPapadopoulos
force-pushed
the
dos2unix
branch
from
6c9fa6a to
6400730
Compare
Contributor
Author
|
@brunto Should merge without conflicts now. |
syl-p
approved these changes
Aug 26, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I have nothing against
CRLF, but I am all for consistency. All other files end lines withLF.