Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor #13263 Remove undocumented conflict on laminas-code ^4.0 (4c0n)
This PR was merged into the 1.9 branch. Discussion ---------- | Q | A | --------------- | ----- | Branch? | 1.9 1.10 master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | License | MIT 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: https://github.com/Sylius/Sylius/blob/49b070933b32761de08475fafd6d86dca10d40ff/.github/workflows/application.yml#L104 should no longer be an issue. If it still is, then I guess the build will show it and there should be a new issue opened somewhere. Commits ------- 0ec9161 Remove undocumented conflict on laminas-code ^4.0
- Loading branch information