Skip to content

Commit 6bbd557

Browse files
committed
Merge branch '2.0'
* 2.0: Generate changelog for v2.0.11 Remove conflict with Symplify libraries
2 parents bd10f2e + 18c0473 commit 6bbd557

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727

2828
# CHANGELOG FOR `2.0.x`
2929

30+
## v2.0.11 (2020-04-04)
31+
32+
- [#106](https://github.com/FriendsOfBehat/SymfonyExtension/issues/106) Fix the build ([@pamil](https://github.com/pamil))
33+
- [#114](https://github.com/FriendsOfBehat/SymfonyExtension/issues/114) Remove conflict with Symplify libraries ([@pamil](https://github.com/pamil))
34+
3035
## v2.0.10 (2019-12-09)
3136

3237
- [#101](https://github.com/FriendsOfBehat/SymfonyExtension/issues/101) Fix referencing context initializers ([@kamazee](https://github.com/kamazee))

composer.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131
"symfony/process": "^4.4|^5.0",
3232
"symfony/yaml": "^4.4|^5.0"
3333
},
34-
"conflict": {
35-
"symplify/package-builder": "^7.2",
36-
"symplify/smart-file-system": "^7.2"
37-
},
3834
"suggest": {
3935
"behat/mink-browserkit-driver": "^1.3"
4036
},

0 commit comments

Comments
 (0)