Skip to content

Commit

Permalink
Add a conflict with terminal42/contao-ce-access <3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
leofeyer committed Sep 2, 2019
1 parent a8e5b9b commit e1de51e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
"symfony/security-core": "4.2.* <4.2.3",
"symfony/swiftmailer-bundle": "2.6.* <2.6.2",
"symfony/twig-bundle": "4.1.0",
"terminal42/contao-ce-access": "<3.0",
"zendframework/zend-code": "<3.3.1"
},
"require-dev": {
Expand Down
3 changes: 2 additions & 1 deletion core-bundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@
"symfony/doctrine-bridge": "<3.4",
"symfony/security-core": "4.2.* <4.2.3",
"symfony/swiftmailer-bundle": "2.6.* <2.6.2",
"symfony/twig-bundle": "4.1.0"
"symfony/twig-bundle": "4.1.0",
"terminal42/contao-ce-access": "<3.0"
},
"require-dev": {
"ext-fileinfo": "*",
Expand Down

0 comments on commit e1de51e

Please sign in to comment.