Skip to content

Commit ffe280c

Browse files
committed
AC-3764::Resolve the conflicts
1 parent a740694 commit ffe280c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/internal/Magento/Framework/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"ext-xsl": "*",
2525
"lib-libxml": "*",
2626
"colinmollenhour/php-redis-session-abstract": "^1.5",
27-
"composer/composer": "^1.9 || ^2.0, !=2.2.16",
27+
"composer/composer": "^2.0, !=2.2.16",
2828
"ezyang/htmlpurifier": "^4.14",
2929
"guzzlehttp/guzzle": "^7.4",
3030
"laminas/laminas-code": "^4.5",

0 commit comments

Comments
 (0)