Merge pull request #1 from emodric/patch-1

Use replace instead of conflict for sensio/distribution-bundle
SyliusLabs · Jun 11, 2018 · b03786d · b03786d
2 parents 360ca81 + 1680f10
commit b03786d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         "symfony/process": "~2.3|~3.0|^4.0",
         "sensiolabs/security-checker": "~3.0|~4.0"
     },
-    "conflict": {
+    "replace": {
         "sensio/distribution-bundle": "*"
     },
     "autoload": {