Skip to content

Commit

Permalink
zend-mvc is not a conflict
Browse files Browse the repository at this point in the history
Despite zendframework#5, the classes in this package do not conflict with those in zend-mvc
v2, and, in point of fact, marking this package as a conflict makes it
impossible to create forwards-compatible packages that work with routing.
  • Loading branch information
weierophinney committed Jul 6, 2016
1 parent f75dee8 commit 48c51dd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
3 changes: 0 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
"suggest": {
"zendframework/zend-i18n": "^2.6, if defining translatable HTTP path segments"
},
"conflict": {
"zendframework/zend-mvc": "<3.0.0"
},
"extra": {
"branch-alias": {
"dev-master": "3.0-dev",
Expand Down
4 changes: 2 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 48c51dd

Please sign in to comment.