Skip to content

Commit 0c927d7

Browse files
committed
bug symfony#19932 Fixed bad merge (GrahamCampbell)
This PR was submitted for the 3.1 branch but it was merged into the 2.8 branch instead (closes symfony#19932). Discussion ---------- Fixed bad merge | Q | A | ------------- | --- | Branch? | 3.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT Commits ------- d30374d Fixed bad merge
2 parents fc97aa5 + d30374d commit 0c927d7

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/Symfony/Component/Console/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": ">=5.3.9",
2020
"symfony/polyfill-mbstring": "~1.0",
21-
"symfony/debug": "~2.7,>=2.7.2"
21+
"symfony/debug": "~2.7,>=2.7.2|~3.0"
2222
},
2323
"require-dev": {
2424
"symfony/event-dispatcher": "~2.1|~3.0.0",

0 commit comments

Comments
 (0)