Drop conflict with zend-diactoros

Signed-off-by: Aleksei Khudiakov <[email protected]>
laminas · May 2, 2023 · f88a19c · f88a19c
1 parent 29cf68e
commit f88a19c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -54,9 +54,6 @@
         "psr/http-factory-implementation": "1.0",
         "psr/http-message-implementation": "1.0"
     },
-    "conflict": {
-        "zendframework/zend-diactoros": "*"
-    },
     "autoload": {
         "files": [
             "src/functions/create_uploaded_file.php",

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