Fix merge

nicolas-grekas · nicolas-grekas · commit eccbe677c814 · 2016-07-20T08:55:49.000+03:00
diff --git a/composer.json b/composer.json
@@ -90,7 +90,8 @@
         "phpdocumentor/reflection-docblock": "^3.0"
     },
     "conflict": {
-        "phpdocumentor/reflection-docblock": "<3.0"
+        "phpdocumentor/reflection-docblock": "<3.0",
+        "phpdocumentor/type-resolver": "<0.2.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -55,7 +55,8 @@
         "twig/twig": "~1.23|~2.0"
     },
     "conflict": {
-        "phpdocumentor/reflection-docblock": "<3.0"
+        "phpdocumentor/reflection-docblock": "<3.0",
+        "phpdocumentor/type-resolver": "<0.2.0"
     },
     "suggest": {
         "ext-apcu": "For best performance of the system caches",
diff --git a/src/Symfony/Component/PropertyInfo/composer.json b/src/Symfony/Component/PropertyInfo/composer.json
@@ -32,7 +32,8 @@
         "doctrine/annotations": "~1.0"
     },
     "conflict": {
-        "phpdocumentor/reflection-docblock": "<3.0"
+        "phpdocumentor/reflection-docblock": "<3.0",
+        "phpdocumentor/type-resolver": "<0.2.0"
     },
     "suggest": {
         "psr/cache-implementation": "To cache results",
