summaryrefslogtreecommitdiff
path: root/composer.json
diff options
context:
space:
mode:
authordkuhnert <[email protected]>2019-06-03 13:22:57 +0200
committerGitHub <[email protected]>2019-06-03 13:22:57 +0200
commit860492f33ea7e3a6c012c639dadd2d85355c85e8 (patch)
tree02d508a00a4c4aa4bc5d58c7d12e88375fa9c6a7 /composer.json
parent7fc9111222f58ac971f6cf7cc3483ed3cec91bd6 (diff)
Fixed `composer.json` merge issue (#155)
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/composer.json b/composer.json
index e59f0459..f71236b1 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
"psr/http-factory": "^1.0",
"psr/http-message": "^1.0",
"symfony/console": "^2.5.0 || ^3.0.0 || ^4.0.0",
- "http-interop/http-factory-diactoros": "^1.0"
+ "zendframework/zend-diactoros": "^1.3 || ^2.0"
},
"autoload": {
"psr-4": {