From fcb330905d0d9d1f92345761e5ace96a09214308 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Thu, 18 Jul 2019 12:43:22 +0200 Subject: [PATCH] fix merge --- composer.json | 1 + src/Symfony/Bundle/FrameworkBundle/composer.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index de3b480c22..4681613073 100644 --- a/composer.json +++ b/composer.json @@ -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", diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 3d7e99a5cc..5f9cc55393 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -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",