From 03bbeafeec7f4958470ded80390d1d63bec87308 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sat, 10 Aug 2019 13:15:05 +0200
Subject: [PATCH] Remove conflict issue in composer.json

---
 composer.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/composer.json b/composer.json
index 3e2b521..ca906c7 100644
--- a/composer.json
+++ b/composer.json
@@ -18,9 +18,6 @@
     "php-coveralls/php-coveralls": "^2.0",
     "squizlabs/php_codesniffer": "^3.0"
   },
-  "conflict": {
-    "phpunit/php-timer": ">=2"
-  },
   "autoload": {
     "psr-0": {
       "WebThumbnailer\\": ["src/", "tests/"]