Remove undocumented conflict on laminas-code ^4.0 #13263
Merged
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.
https://sylius-devs.slack.com/archives/C3EGDG9LY/p1634735181098300
This conflict is not documented in
CONFLICTS.md
anymore, was brought back in this commit:f80f42d
However according laminas/laminas-code#67 and considering:
Sylius/.github/workflows/application.yml
Line 104 in 49b0709
If it still is, then I guess the build will show it and there should be a new issue opened somewhere.