Skip to content

Commit

Permalink
upgrade require-dev "doctrine/doctrine-orm-module": "^2.1" and make c…
Browse files Browse the repository at this point in the history
…onflict for <2.1
  • Loading branch information
samsonasik committed Sep 26, 2018
1 parent bd6e33e commit 611e4b0
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"require-dev": {
"aura/di": "^3.4",
"doctrine/doctrine-orm-module": "^1.1",
"doctrine/doctrine-orm-module": "^2.1",
"kahlan/kahlan": "^4.1.1",
"northwoods/container": "^3.0",
"php-coveralls/php-coveralls": "^2.0",
Expand All @@ -43,6 +43,7 @@
"zendframework/zend-servicemanager": "^3.3"
},
"conflict": {
"doctrine/doctrine-orm-module": "<2.1",
"zendframework/zend-expressive": "<3.0 >=4.0",
"zendframework/zend-mvc": "<3.0 >=4.0",
"zendframework/zend-servicemanager": "<3.3"
Expand Down

0 comments on commit 611e4b0

Please sign in to comment.