Fix duplicated code from bad cherry-pick conflict resolution. #1208
Conversation
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
This increment was moved lower down in the function, but not removed here in the conflict resolution in #1192.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This increment was moved a few lines lower down in the function in the upstream commit, but during the conflict resolution for #1192, I missed removing it here, so it became duplicated.
Description
This was a bad merge on my part in PR #1192, resulted in this if block being duplicated (it is present a few lines below this), which is rectified here.
Tested
Not specially tested, very clear fix of a bug.