Skip to content

Commit

Permalink
minor #241 Adding conflicts with pagerfanta 2 (loic425)
Browse files Browse the repository at this point in the history
This PR was merged into the 1.12 branch.

Discussion
----------



Commits
-------

5b9f4a1 Adding conflicts with pagerfanta 2
7d51d04 Apply suggestions from code review
  • Loading branch information
Zales0123 authored Oct 31, 2022
2 parents 498005a + 7d51d04 commit f1f7882
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,12 @@
"sylius/grid": "self.version"
},
"conflict": {
"twig/twig": "^1.0"
"twig/twig": "<2.12",
"pagerfanta/core": "<3.0",
"pagerfanta/doctrine-phpcr-odm-adapter": "<3.0",
"pagerfanta/doctrine-dbal-adapter": "<3.0",
"pagerfanta/doctrine-orm-adapter": "<3.0",
"pagerfanta/pagefanta": "<3.0"
},
"require-dev": {
"doctrine/doctrine-bundle": "^1.12 || ^2.0",
Expand Down

0 comments on commit f1f7882

Please sign in to comment.