Merge branch '2.0'

* 2.0: Fix the build
2020-01-13 20:28:39 +01:00
parent 40acf76a29 97a0f50070
commit f2ba93c12e
1 changed files with 3 additions and 1 deletions
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,9 @@
        "symfony/yaml": "^3.4|^4.2"
    },
    "conflict": {
-        "symfony/stopwatch": "^5.0"
+        "symfony/stopwatch": "^5.0",
+        "symplify/package-builder": "^7.2",
+        "symplify/smart-file-system": "^7.2"
    },
    "suggest": {
        "behat/mink-browserkit-driver": "^1.3"