Fixed bad merge

This commit is contained in:
Graham Campbell 2016-09-13 22:12:03 +01:00 committed by Fabien Potencier
parent fc97aa5e3b
commit d30374d7eb

View File

@ -18,7 +18,7 @@
"require": { "require": {
"php": ">=5.3.9", "php": ">=5.3.9",
"symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-mbstring": "~1.0",
"symfony/debug": "~2.7,>=2.7.2" "symfony/debug": "~2.7,>=2.7.2|~3.0"
}, },
"require-dev": { "require-dev": {
"symfony/event-dispatcher": "~2.1|~3.0.0", "symfony/event-dispatcher": "~2.1|~3.0.0",