tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 00:04:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge errors

Browse Source
This commit is contained in:
Calvo 2023-10-26 16:24:49 +02:00
parent aaea2e59c4
commit 936508174f
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -325,7 +325,6 @@ our @ServerTypes = qw (
ncmserver ncmserver
netflowserver netflowserver
logserver logserver
logserver
madeserver 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'); 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');

1
pandora_server/lib/PandoraFMS/Tools.pm
View File

@ -79,7 +79,6 @@ our @EXPORT = qw(
NCMSERVER NCMSERVER
NETFLOWSERVER NETFLOWSERVER
LOGSERVER LOGSERVER
LOGSERVER
MADESERVER MADESERVER
METACONSOLE_LICENSE METACONSOLE_LICENSE
OFFLINE_LICENSE OFFLINE_LICENSE