fix merge

This commit is contained in:
Nicolas Grekas 2019-07-18 12:43:22 +02:00
parent ed0b361d6f
commit fcb330905d
2 changed files with 2 additions and 1 deletions

View File

@ -48,6 +48,7 @@
"symfony/doctrine-bridge": "self.version",
"symfony/dom-crawler": "self.version",
"symfony/dotenv": "self.version",
"symfony/error-handler": "self.version",
"symfony/error-renderer": "self.version",
"symfony/event-dispatcher": "self.version",
"symfony/expression-language": "self.version",

View File

@ -41,6 +41,7 @@
"symfony/form": "^4.3|^5.0",
"symfony/expression-language": "^3.4|^4.0|^5.0",
"symfony/http-client": "^4.3|^5.0",
"symfony/lock": "^4.4|^5.0",
"symfony/mailer": "^4.3|^5.0",
"symfony/messenger": "^4.3|^5.0",
"symfony/mime": "^4.3|^5.0",
@ -57,7 +58,6 @@
"symfony/workflow": "^4.3|^5.0",
"symfony/yaml": "^3.4|^4.0|^5.0",
"symfony/property-info": "^3.4|^4.0|^5.0",
"symfony/lock": "^4.4|^5.0",
"symfony/web-link": "^3.4|^4.0|^5.0",
"doctrine/annotations": "~1.0",
"phpdocumentor/reflection-docblock": "^3.0|^4.0",