diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-06-09 12:10:05 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-06-09 12:10:05 +0200 |
| commit | 922214a776568cb529569320af5f76a1a3c1f45e (patch) | |
| tree | 6e5537c84a7787e50ce9ea81a1b3ed764250b0dc /composer-dev.json | |
| parent | fec37b26f27f7ce5c75aba384b553814db134617 (diff) | |
php-phpunit-PHPUnit: 5.4.4
Diffstat (limited to 'composer-dev.json')
| -rw-r--r-- | composer-dev.json | 3 |
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" |