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

Merge branch '4.0' into 4.1 

* 4.0:
  fixed bad merge
This commit is contained in:
Fabien Potencier 2018-05-21 13:08:00 +02:00
parent 389092a6a9 dff61b82ff
commit 7cb6e61f77
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Symfony/Bridge/Doctrine/composer.json
View File

@ -24,7 +24,6 @@
"require-dev": {
"symfony/stopwatch": "~3.4|~4.0",
"symfony/dependency-injection": "~3.4|~4.0",
<<<<<<< HEAD
"symfony/form": "~3.4|~4.0",
"symfony/http-kernel": "~3.4|~4.0",
"symfony/property-access": "~3.4|~4.0",
@ -34,17 +33,6 @@
"symfony/expression-language": "~3.4|~4.0",
"symfony/validator": "~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/dbal": "~2.4",
"doctrine/orm": "^2.4.5"