[Fixed issue] - Detect Line ending changes on Reload#4034
Closed
SinghRajenM wants to merge 1 commit intonotepad-plus-plus:masterfrom
Closed
[Fixed issue] - Detect Line ending changes on Reload#4034SinghRajenM wants to merge 1 commit intonotepad-plus-plus:masterfrom
SinghRajenM wants to merge 1 commit intonotepad-plus-plus:masterfrom
Conversation
Contributor
|
Ouch, haven't noticed your pull request before submitting #4077... not sure what to do now, since I also corrected detecting encoding on reload (so default encoding for ANSI files is respected when reloading) :/ I can close my PR if there is a fix for #2843 out there somewhere - and since nobody mentioned it in the issue, I don't think there is. |
Contributor
Author
Contributor
|
That's cool then =) I guess if your PR gets merged first then mine will throw some merge issues, which actually won't be merge issues (as it's 1:1 code), and thus both can work together just fine. |
Member
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.
Fixed issue #4033