From 936508174ffe1f84efe2c7fda3333c5309d42f77 Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@pandorafms.com>
Date: Thu, 26 Oct 2023 16:24:49 +0200
Subject: [PATCH] Fix merge errors

---
 pandora_server/lib/PandoraFMS/Core.pm  | 1 -
 pandora_server/lib/PandoraFMS/Tools.pm | 1 -
 2 files changed, 2 deletions(-)

diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 90b039a078..51ab5b3462 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -325,7 +325,6 @@ our @ServerTypes = qw (
 	ncmserver
 	netflowserver
 	logserver
-	logserver
 	madeserver
 );
 our @AlertStatus = ('Execute the alert', 'Do not execute the alert', 'Do not execute the alert, but increment its internal counter', 'Cease the alert', 'Recover the alert', 'Reset internal counter');
diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm
index 7c5a823a1d..70d697dab4 100755
--- a/pandora_server/lib/PandoraFMS/Tools.pm
+++ b/pandora_server/lib/PandoraFMS/Tools.pm
@@ -79,7 +79,6 @@ our @EXPORT = qw(
 	NCMSERVER
 	NETFLOWSERVER
 	LOGSERVER
-	LOGSERVER
 	MADESERVER
 	METACONSOLE_LICENSE
 	OFFLINE_LICENSE