diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug #19932 Fixed bad merge (GrahamCampbell)

Browse Source 
This PR was submitted for the 3.1 branch but it was merged into the 2.8 branch instead (closes #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
This commit is contained in:
Fabien Potencier 2016-09-13 16:47:15 -07:00
commit 0c927d74d4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Console/composer.json
View File

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