From 707c49e851e3d78a3772ba7c9ae98188d02f0774 Mon Sep 17 00:00:00 2001
From: Mark Sch <dereuromark@users.noreply.github.com>
Date: Fri, 27 Dec 2019 20:15:15 +0100
Subject: [PATCH] Fix merge error

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

diff --git a/composer.json b/composer.json
index 479cbf807..589b3c16f 100644
--- a/composer.json
+++ b/composer.json
@@ -51,9 +51,7 @@
         "phpstan": "phpstan analyse src/",
         "phpstan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan-shim:^0.11 && mv composer.backup composer.json",
         "test": "phpunit",
-        "test-coverage": "phpunit --coverage-clover=clover.xml",
-        "phpstan": "phpstan analyse src/",
-        "phpstan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan-shim:^0.11 && mv composer.backup composer.json"
+        "test-coverage": "phpunit --coverage-clover=clover.xml"
     },
     "prefer-stable": true,
     "minimum-stability": "dev"