File tree Expand file tree Collapse file tree 1 file changed +0
-12
lines changed
src/Symfony/Bridge/Doctrine Expand file tree Collapse file tree 1 file changed +0
-12
lines changed Original file line number Diff line number Diff line change 2424 "require-dev" : {
2525 "symfony/stopwatch" : " ~3.4|~4.0"
2626 "symfony/dependency-injection" : " ~3.4|~4.0"
27- <<<<<<< HEAD
2827 "symfony/form" : " ~3.4|~4.0"
2928 "symfony/http-kernel" : " ~3.4|~4.0"
3029 "symfony/property-access" : " ~3.4|~4.0"
3433 "symfony/expression-language" : " ~3.4|~4.0"
3534 "symfony/validator" : " ~3.4|~4.0"
3635 "symfony/translation" : " ~3.4|~4.0"
37- =======
38- "symfony/form" : " ^3.3.10|~4.0"
39- "symfony/http-kernel" : " ~2.8|~3.0|~4.0"
40- "symfony/property-access" : " ~2.8|~3.0|~4.0"
41- "symfony/property-info" : " ~2.8|3.0|~4.0"
42- "symfony/proxy-manager-bridge" : " ~2.8|~3.0|~4.0"
43- "symfony/security" : " ^2.8.31|^3.3.13|~4.0"
44- "symfony/expression-language" : " ~2.8|~3.0|~4.0"
45- "symfony/validator" : " ^3.2.5|~4.0"
46- "symfony/translation" : " ~2.8|~3.0|~4.0"
47- >>>>>>> 3.4
4836 "doctrine/data-fixtures" : " 1.0.*"
4937 "doctrine/dbal" : " ~2.4"
5038 "doctrine/orm" : " ^2.4.5"
You can’t perform that action at this time.
0 commit comments