Fix merge

This commit is contained in:
Nicolas Grekas 2015-10-24 17:25:13 +02:00
parent 3e923d0726
commit f863e6af9a
1 changed files with 1 additions and 1 deletions

View File

@ -46,7 +46,7 @@
"symfony/expression-language": "~2.8|~3.0",
"symfony/process": "~2.8|~3.0",
"symfony/validator": "~2.8|~3.0",
"symfony/yaml": "~2.8|~3.0"
"symfony/yaml": "~2.8|~3.0",
"symfony/property-info": "~2.8|~3.0",
"phpdocumentor/reflection": "^1.0.7"
},