From edf97f027bcc89c14e174243decccde5d2673c0d Mon Sep 17 00:00:00 2001
From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com>
Date: Tue, 25 Jan 2022 00:00:11 +0100
Subject: Fix number of tests

---
 plugins-root/t/check_icmp.t | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugins-root/t/check_icmp.t b/plugins-root/t/check_icmp.t
index bb7cfbc9..e8907184 100644
--- a/plugins-root/t/check_icmp.t
+++ b/plugins-root/t/check_icmp.t
@@ -12,11 +12,7 @@ my $allow_sudo = getTestParameter( "NP_ALLOW_SUDO",
 	"no" );
 
 if ($allow_sudo eq "yes" or $> == 0) {
-<<<<<<< HEAD
 	plan tests => 18;
-=======
-	plan tests => 20;
->>>>>>> 44f19e79 (Fix tests (hopefully))
 } else {
 	plan skip_all => "Need sudo to test check_icmp";
 }
-- 
cgit v1.2.3-74-g34f1