Fix merge
This commit is contained in:
parent
31e64bf7c5
commit
51b15695f0
@ -32,7 +32,7 @@
|
|||||||
"symfony/http-kernel": "^3.3.5|~4.0",
|
"symfony/http-kernel": "^3.3.5|~4.0",
|
||||||
"symfony/security-csrf": "~2.8|~3.0|~4.0",
|
"symfony/security-csrf": "~2.8|~3.0|~4.0",
|
||||||
"symfony/translation": "~2.8|~3.0|~4.0",
|
"symfony/translation": "~2.8|~3.0|~4.0",
|
||||||
"symfony/var-dumper": "^3.3.11|~4.0",
|
"symfony/var-dumper": "~3.3.11|~3.4-beta3|~4.0",
|
||||||
"symfony/console": "~3.4|~4.0"
|
"symfony/console": "~3.4|~4.0"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
|
Reference in New Issue
Block a user