MAGETWO-42272: Failed to load swagger ui page

- resolve merge conflict

MAGETWO-42272: Failed to load swagger ui page
- resolve merge conflict
381b7ee1 · Joan He · 3691d5a7 · 381b7ee1
Commit 381b7ee1 authored 9 years ago by Joan He
--- a/app/code/Magento/CatalogRuleConfigurable/composer.json
+++ b/app/code/Magento/CatalogRuleConfigurable/composer.json
@@ -3,11 +3,13 @@
    "description": "N/A",
    "require": {
        "php": "~5.5.0|~5.6.0|~7.0.0",
-        "magento/module-catalog-rule": "1.0.0-beta",
        "magento/module-configurable-product": "1.0.0-beta",
        "magento/framework": "1.0.0-beta",
        "magento/magento-composer-installer": "*"
    },
+    "suggest": {
+        "magento/module-catalog-rule": "1.0.0-beta"
+    },
    "type": "magento2-module",
    "version": "1.0.0-beta",
    "license": [