Merge pull request #84 from weierophinney/bugfix/zend-view-replacement

Conflict with zend-view, not zend-router
laminas · Oct 12, 2021 · 0957665 · 0957665
2 parents 2b396ad + f0e444e
commit 0957665
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -55,7 +55,7 @@
     "conflict": {
         "laminas/laminas-servicemanager": "<3.3",
         "laminas/laminas-router": "<3.0.1",
-        "zendframework/zend-router": "*"
+        "zendframework/zend-view": "*"
     },
     "suggest": {
         "laminas/laminas-authentication": "Laminas\\Authentication component",

diff --git a/composer.lock b/composer.lock