[4.3] fix: merge mistake for rector.php#6980
Merged
kenjis merged 2 commits intocodeigniter4:4.3from Dec 15, 2022
Merged
Conversation
I forgot to add it when merging.
samsonasik
approved these changes
Dec 15, 2022
samsonasik
reviewed
Dec 15, 2022
samsonasik
requested changes
Dec 15, 2022
I don't know why it is not removed. Did I mistake on merging?
samsonasik
approved these changes
Dec 15, 2022
Member
Author
|
Yes, Frankly, I am not sure why the line in skip was not deleted when I merged |
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
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.
Description
I forgot to add it when merging.Remove the line that was removed in
develop.It should be removed when merging, but maybe I did something wrong when resolving conflicts.
Checklist: