Merge pull request #130 from magento-obsessive-owls/MC-3697-add-conflict-with-bluefoot

Igor Melnikov · web-flow · commit 9d40f18245c6 · 2018-08-24T15:48:23.000-05:00
[CMS Team 2 - Sprint 15] Add conflict with BlueFoot to composer.json
diff --git a/app/code/Magento/PageBuilder/composer.json b/app/code/Magento/PageBuilder/composer.json
@@ -18,6 +18,9 @@
         "magento/module-directory": "*",
         "php": "~7.1.3||~7.2.0"
     },
+    "conflict": {
+        "gene/bluefoot": "*"
+    },
     "type": "magento2-module",
     "license": [
         "proprietary"
