bug #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 #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:
commit
0c927d74d4
@ -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",
|
||||
|
Reference in New Issue
Block a user