fix merge

nicolas-grekas · nicolas-grekas · commit 086e457eebba · 2017-08-31T20:43:21.000+02:00
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
@@ -28,12 +28,12 @@
         "symfony/validator": "~3.4|~4.0",
         "symfony/dependency-injection": "~3.4|~4.0",
         "symfony/config": "~3.4|~4.0",
+        "symfony/console": "~3.4|~4.0",
         "symfony/http-foundation": "~3.4|~4.0",
         "symfony/http-kernel": "~3.4|~4.0",
         "symfony/security-csrf": "~3.4|~4.0",
         "symfony/translation": "~3.4|~4.0",
         "symfony/var-dumper": "~3.4|~4.0"
-        "symfony/console": "~3.4|~4.0"
     },
     "conflict": {
         "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
