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

Fix a merge error.

Browse Source
This commit is contained in:
Ramon Novoa 2024-02-26 10:17:03 +01:00
parent 9e18d5d627
commit 5f48232144
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -1421,13 +1421,11 @@ sub pandora_load_config {
elsif ($parametro =~ m/^madeserver\s+([0-1])/i) {
$pa_config->{'madeserver'}= clean_blank($1);
}
<<<<<<< HEAD
elsif ($parametro =~ m/^multiprocess\s+([0-1])/i) {
$pa_config->{'multiprocess'}= clean_blank($1);
=======
}
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 #