Merge branch '4.1'
* 4.1: fixed bad merge
This commit is contained in:
commit
021531b55f
@ -24,7 +24,6 @@
|
|||||||
"require-dev": {
|
"require-dev": {
|
||||||
"symfony/stopwatch": "~3.4|~4.0",
|
"symfony/stopwatch": "~3.4|~4.0",
|
||||||
"symfony/dependency-injection": "~3.4|~4.0",
|
"symfony/dependency-injection": "~3.4|~4.0",
|
||||||
<<<<<<< HEAD
|
|
||||||
"symfony/form": "~3.4|~4.0",
|
"symfony/form": "~3.4|~4.0",
|
||||||
"symfony/http-kernel": "~3.4|~4.0",
|
"symfony/http-kernel": "~3.4|~4.0",
|
||||||
"symfony/property-access": "~3.4|~4.0",
|
"symfony/property-access": "~3.4|~4.0",
|
||||||
@ -34,17 +33,6 @@
|
|||||||
"symfony/expression-language": "~3.4|~4.0",
|
"symfony/expression-language": "~3.4|~4.0",
|
||||||
"symfony/validator": "~3.4|~4.0",
|
"symfony/validator": "~3.4|~4.0",
|
||||||
"symfony/translation": "~3.4|~4.0",
|
"symfony/translation": "~3.4|~4.0",
|
||||||
=======
|
|
||||||
"symfony/form": "^3.3.10|~4.0",
|
|
||||||
"symfony/http-kernel": "~2.8|~3.0|~4.0",
|
|
||||||
"symfony/property-access": "~2.8|~3.0|~4.0",
|
|
||||||
"symfony/property-info": "~2.8|3.0|~4.0",
|
|
||||||
"symfony/proxy-manager-bridge": "~2.8|~3.0|~4.0",
|
|
||||||
"symfony/security": "^2.8.31|^3.3.13|~4.0",
|
|
||||||
"symfony/expression-language": "~2.8|~3.0|~4.0",
|
|
||||||
"symfony/validator": "^3.2.5|~4.0",
|
|
||||||
"symfony/translation": "~2.8|~3.0|~4.0",
|
|
||||||
>>>>>>> 3.4
|
|
||||||
"doctrine/data-fixtures": "1.0.*",
|
"doctrine/data-fixtures": "1.0.*",
|
||||||
"doctrine/dbal": "~2.4",
|
"doctrine/dbal": "~2.4",
|
||||||
"doctrine/orm": "^2.4.5"
|
"doctrine/orm": "^2.4.5"
|
||||||
|
Reference in New Issue
Block a user