From 922214a776568cb529569320af5f76a1a3c1f45e Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Thu, 9 Jun 2016 12:10:05 +0200
Subject: php-phpunit-PHPUnit: 5.4.4

---
 composer-dev.json | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'composer-dev.json')

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"
-- 
cgit