From 381b7ee151bc77a278069942cb6ca60e77bc5454 Mon Sep 17 00:00:00 2001
From: Joan He <joan@x.com>
Date: Tue, 22 Sep 2015 12:54:35 -0500
Subject: [PATCH] MAGETWO-42272: Failed to load swagger ui page

- resolve merge conflict
---
 app/code/Magento/CatalogRuleConfigurable/composer.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogRuleConfigurable/composer.json b/app/code/Magento/CatalogRuleConfigurable/composer.json
index c689ed54a3c..fc6bea322d3 100644
--- 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": [
-- 
GitLab