From 3942776a8c99209908ee0b287746263725685732 Mon Sep 17 00:00:00 2001
From: SamRemis <sjremis94@gmail.com>
Date: Fri, 3 Sep 2021 18:57:30 -0400
Subject: [PATCH] removed conflict (#48)

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

diff --git a/composer.json b/composer.json
index 3d7e6a9..4b96140 100644
--- a/composer.json
+++ b/composer.json
@@ -20,9 +20,6 @@
     "require-dev": {
         "phpunit/phpunit":"^4.8.35|^5.4.3"
     },
-    "conflict": {
-        "phpunit/php-timer": ">=2"
-    },
     "autoload": {
         "classmap": [
             "src/"