Merge branch '2.0'

* 2.0:
  Generate changelog for v2.0.11
  Remove conflict with Symplify libraries
This commit is contained in:
Kamil Kokot
2020-04-04 18:38:25 +02:00
2 changed files with 5 additions and 4 deletions

View File

@@ -27,6 +27,11 @@
# CHANGELOG FOR `2.0.x` # 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) ## v2.0.10 (2019-12-09)
- [#101](https://github.com/FriendsOfBehat/SymfonyExtension/issues/101) Fix referencing context initializers ([@kamazee](https://github.com/kamazee)) - [#101](https://github.com/FriendsOfBehat/SymfonyExtension/issues/101) Fix referencing context initializers ([@kamazee](https://github.com/kamazee))

View File

@@ -31,10 +31,6 @@
"symfony/process": "^4.4|^5.0", "symfony/process": "^4.4|^5.0",
"symfony/yaml": "^4.4|^5.0" "symfony/yaml": "^4.4|^5.0"
}, },
"conflict": {
"symplify/package-builder": "^7.2",
"symplify/smart-file-system": "^7.2"
},
"suggest": { "suggest": {
"behat/mink-browserkit-driver": "^1.3" "behat/mink-browserkit-driver": "^1.3"
}, },