diff options
| author | Anton Titov <[email protected]> | 2019-06-03 14:42:10 +0300 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-06-03 14:42:10 +0300 |
| commit | a65d73191cd1689411af69669b8eb04395938bc8 (patch) | |
| tree | 02d508a00a4c4aa4bc5d58c7d12e88375fa9c6a7 | |
| parent | 7fc9111222f58ac971f6cf7cc3483ed3cec91bd6 (diff) | |
| parent | 860492f33ea7e3a6c012c639dadd2d85355c85e8 (diff) | |
Merge pull request #156 from dkuhnert/fix_composer_deps
Fixed `composer.json` merge issue (#155)
| -rw-r--r-- | composer.json | 2 |
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": { |