Fix a merge error.

pandora_server/lib/PandoraFMS/Config.pm

@@ -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 #