summaryrefslogtreecommitdiffstats
path: root/composer-dev.json
diff options
context:
space:
mode:
Diffstat (limited to 'composer-dev.json')
-rw-r--r--composer-dev.json3
1 files changed, 3 insertions, 0 deletions
diff --git a/composer-dev.json b/composer-dev.json
index 142b29b..64d5285 100644
--- a/composer-dev.json
+++ b/composer-dev.json
@@ -43,6 +43,9 @@
"ext-reflection": "*",
"ext-spl": "*"
},
+ "conflict": {
+ "phpdocumentor/reflection-docblock": "3.0.2"
+ },
"config": {
"platform": {
"php": "5.6.0"