Skip to content

Commit 5482cdf

Browse files
committed
MC-13825: [2.4.x] Migrate ZF2 components to Laminas
-- fix merge conflict
1 parent c4eb299 commit 5482cdf

File tree

2 files changed

+322
-501
lines changed

2 files changed

+322
-501
lines changed

composer.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@
6565
"laminas/laminas-uri": "^2.5.1",
6666
"laminas/laminas-validator": "^2.6.0",
6767
"laminas/laminas-view": "~2.11.2",
68-
"league/flysystem": "^1.0",
69-
"league/flysystem-aws-s3-v3": "^1.0",
70-
"league/flysystem-azure-blob-storage": "^0.1.6",
7168
"magento/composer": "1.6.x-dev",
7269
"magento/magento-composer-installer": ">=0.1.11",
7370
"magento/zendframework1": "~1.14.2",

0 commit comments

Comments
 (0)