From c707d55bb18fe92fe4803409b174146ed21f7b9a Mon Sep 17 00:00:00 2001 From: Kamil Kokot Date: Sat, 4 Apr 2020 14:23:04 +0200 Subject: [PATCH 1/2] Remove conflict with Symplify libraries --- composer.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 9a2268d..576a1fc 100644 --- a/composer.json +++ b/composer.json @@ -30,9 +30,7 @@ "symfony/yaml": "^3.4|^4.1" }, "conflict": { - "symfony/stopwatch": "^5.0", - "symplify/package-builder": "^7.2", - "symplify/smart-file-system": "^7.2" + "symfony/stopwatch": "^5.0" }, "suggest": { "behat/mink-browserkit-driver": "^1.3" From 18c04731efaef67db660175ada560c26b9092a0a Mon Sep 17 00:00:00 2001 From: Kamil Kokot Date: Sat, 4 Apr 2020 14:33:55 +0200 Subject: [PATCH 2/2] Generate changelog for v2.0.11 --- CHANGELOG-2.0.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG-2.0.md b/CHANGELOG-2.0.md index 1c68d67..632ed77 100644 --- a/CHANGELOG-2.0.md +++ b/CHANGELOG-2.0.md @@ -1,5 +1,10 @@ # CHANGELOG for `2.0.x` +## v2.0.11 (2020-04-04) + +- [#106](https://github.com/FriendsOfBehat/SymfonyExtension/issues/106) Fix the build ([@pamil](https://github.com/pamil)) +- [#114](https://github.com/FriendsOfBehat/SymfonyExtension/issues/114) Remove conflict with Symplify libraries ([@pamil](https://github.com/pamil)) + ## v2.0.10 (2019-12-09) - [#101](https://github.com/FriendsOfBehat/SymfonyExtension/issues/101) Fix referencing context initializers ([@kamazee](https://github.com/kamazee))