Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

Commit e934b2c

Browse files
committed
Merge pull request #233 from boesing/enhancement/replace-zend-router
Ensure that we replace `zendframework/zend-router` due to class confl… Conflicts: composer.lock
2 parents e0dd48d + 814020d commit e934b2c

File tree

2 files changed

+736
-381
lines changed

2 files changed

+736
-381
lines changed

composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@
4545
"phpunit/PHPUnit": "^4.5",
4646
"sebastian/version": "^1.0.4"
4747
},
48+
"replace": {
49+
"zendframework/zend-router": "^2.0"
50+
},
4851
"suggest": {
4952
"zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin",
5053
"zendframework/zend-config": "Zend\\Config component",

0 commit comments

Comments
 (0)