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

Merge branch '3.0'

Browse Source 
* 3.0:
  fixed bad merge
This commit is contained in:
Fabien Potencier 2016-04-28 12:08:49 +02:00
commit d60292419b
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,19 +21,11 @@
"symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
<<<<<<< HEAD
"symfony/stopwatch": "~2.8|~3.0",
"symfony/dependency-injection": "~2.8|~3.0",
"symfony/form": "~3.0",
"symfony/form": "~3.0,>=3.0.5",
"symfony/http-kernel": "~2.8|~3.0",
"symfony/property-access": "~2.8|~3.0",
=======
"symfony/stopwatch": "~2.2|~3.0.0",
"symfony/dependency-injection": "~2.2|~3.0.0",
"symfony/form": "~2.8.5|~3.0.5",
"symfony/http-kernel": "~2.2|~3.0.0",
"symfony/property-access": "~2.3|~3.0.0",
>>>>>>> 2.8
"symfony/property-info": "~2.8|3.0",
"symfony/security": "~2.8|~3.0",
"symfony/expression-language": "~2.8|~3.0",