Removed test conflicts by updating the ReflectionDocBlock dependency

phpDocumentor · Feb 26, 2016 · 36c42b1 · 36c42b1
1 parent eab7efd
commit 36c42b1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
         "phpdocumentor/graphviz":            "^1.0",
         "phpdocumentor/fileset":             "^1.0",
         "phpdocumentor/reflection":          "dev-develop@dev",
-        "phpdocumentor/reflection-docblock": "^3.0@dev",
+        "phpdocumentor/reflection-docblock": "^3.0",
         "phpdocumentor/flyfinder":           "^1.0@dev",
         "league/tactician":                  "^0.6.0",
         "league/flysystem":                  "^1.0",

diff --git a/composer.lock b/composer.lock