[monitoring-plugins] Fix number of tests

[RincewindsHat]

 Module: monitoring-plugins
 Branch: check_icmp_buffer_offerflow
 Commit: edf97f027bcc89c14e174243decccde5d2673c0d
 Author: RincewindsHat <12514511+RincewindsHat at users.noreply.github.com>
   Date: Tue Jan 25 00:00:11 2022 +0100
    URL: https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=edf97f0

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 bb7cfbc..e890718 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";
 }