From 5f48232144a09c39ebd47262fa8e90e41f93b6b5 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Mon, 26 Feb 2024 10:17:03 +0100 Subject: [PATCH] Fix a merge error. --- pandora_server/lib/PandoraFMS/Config.pm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index 74f4c9b8b6..1140e68249 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -1418,16 +1418,14 @@ sub pandora_load_config { elsif ($parametro =~ m/^ssl_verify\s+([0-1])/i) { $pa_config->{'ssl_verify'} = clean_blank($1); } - elsif ($parametro =~ m/^madeserver\s+([0-1])/i){ + elsif ($parametro =~ m/^madeserver\s+([0-1])/i) { $pa_config->{'madeserver'}= clean_blank($1); } -<<<<<<< HEAD - elsif ($parametro =~ m/^multiprocess\s+([0-1])/i){ + elsif ($parametro =~ m/^multiprocess\s+([0-1])/i) { $pa_config->{'multiprocess'}= clean_blank($1); -======= - elsif ($parametro =~ m/^too_many_xml\s+([0-9]*)/i){ + } + elsif ($parametro =~ m/^too_many_xml\s+([0-9]*)/i) { $pa_config->{'too_many_xml'}= clean_blank($1); ->>>>>>> origin/develop } } # end of loop for parameter #