Merge pull request #125 from boesing/bugfix/conflict-with-psr-extension

Conflict with `ext-psr`
laminas · Apr 7, 2022 · 68ac2fb · 68ac2fb
2 parents f14e60a + 40767fa
commit 68ac2fb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -53,6 +53,7 @@
         "psr/container-implementation": "^1.0"
     },
     "conflict": {
+        "ext-psr": "*",
         "laminas/laminas-code": "<3.3.1",
         "zendframework/zend-code": "<3.3.1",
         "zendframework/zend-servicemanager": "*"

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