Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
minor #16131 Revert conflict to twig/intl-extra (GSadee)
This PR was merged into the 1.12 branch. Discussion ---------- | Q | A | |-----------------|--------------------------------------------------------------| | Branch? | 1.12| | Bug fix? | no | | New feature? | no | | BC breaks? | no | | Deprecations? | no<!-- don't forget to update the UPGRADE-*.md file --> | | Related tickets | | | License | MIT | I would like to remove the added conflict to `twig/intl-extra` as the newest [v3.9.1 tag](https://github.com/twigphp/Twig/releases/tag/v3.9.1) of `twig/twig` seems to resolve this problem. <!-- - Bug fixes must be submitted against the 1.12 branch - Features and deprecations must be submitted against the 1.13 branch - Make sure that the correct base branch is set To be sure you are not breaking any Backward Compatibilities, check the documentation: https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html --> Commits ------- Revert conflict to twig/intl-extra
- Loading branch information