Skip to content

Commit 3edabcf

Browse files
committed
remove module causing conflict with magento install in fullstackTest
1 parent ac86b40 commit 3edabcf

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

tests/FullStackTest/magento-modules/composer_1.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
"magento-hackathon/magento-composer-installer-test-issue-87": "1.*",
1313
"magento-hackathon/magento-composer-installer-test-updateFileRemove": "1.*",
1414
"magento-hackathon/magento-composer-installer-test-wildcard": "1.*",
15-
"magento-hackathon/magento-composer-installer-test-library": "1.*",
16-
"firegento/magesetup": "*"
15+
"magento-hackathon/magento-composer-installer-test-library": "1.*"
1716
},
1817
"require-dev": {
1918
"magento-hackathon/composer-command-integrator": "*",

tests/FullStackTest/magento-modules/composer_1_copy.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
"magento-hackathon/magento-composer-installer-test-updateFileRemove": "1.*",
1414
"magento-hackathon/magento-composer-installer-test-wildcard": "1.*",
1515
"magento-hackathon/magento-composer-installer-test-wildcard2": "1.*",
16-
"magento-hackathon/magento-composer-installer-test-library": "1.*",
17-
"firegento/magesetup": "*"
16+
"magento-hackathon/magento-composer-installer-test-library": "1.*"
1817
},
1918
"require-dev": {
2019
"magento-hackathon/composer-command-integrator": "*",

0 commit comments

Comments
 (0)