Merge branch '2.0'

* 2.0: Generate changelog for v2.0.11 Remove conflict with Symplify libraries
2020-04-04 18:38:25 +02:00
parent bd10f2e942 18c04731ef
commit 6bbd55793b
2 changed files with 5 additions and 4 deletions
--- a/composer.json
+++ b/composer.json
@@ -31,10 +31,6 @@
        "symfony/process": "^4.4|^5.0",
        "symfony/yaml": "^4.4|^5.0"
    },
-    "conflict": {
-        "symplify/package-builder": "^7.2",
-        "symplify/smart-file-system": "^7.2"
-    },
    "suggest": {
        "behat/mink-browserkit-driver": "^1.3"
    },