Skip to content

Commit 381b7ee

Browse files
author
Joan He
committed
MAGETWO-42272: Failed to load swagger ui page
- resolve merge conflict
1 parent 3691d5a commit 381b7ee

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

app/code/Magento/CatalogRuleConfigurable/composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0|~7.0.0",
6-
"magento/module-catalog-rule": "1.0.0-beta",
76
"magento/module-configurable-product": "1.0.0-beta",
87
"magento/framework": "1.0.0-beta",
98
"magento/magento-composer-installer": "*"
109
},
10+
"suggest": {
11+
"magento/module-catalog-rule": "1.0.0-beta"
12+
},
1113
"type": "magento2-module",
1214
"version": "1.0.0-beta",
1315
"license": [

0 commit comments

Comments
 (0)