diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index f662f02286..1f0fb9f372 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-16 Miguel de Dios  <miguel.dedios@artica.es>
+
+	* include/functions_html.php, operation/reporting/reporting_xml.php,
+	godmode/massive/massive_delete_action_alerts.php,
+	godmode/massive/massive_add_action_alerts.php: cleaned source code, erased
+	lost semicolons.
+
 2011-07-04  Sergio Martin <sergio.martin@artica.es>
 
 	* include/functions_networkmap.php
@@ -74,7 +81,6 @@
 	general/pandora_help.php
 	general/logon_ok.php: Css style improvements.
 
->>>>>>> .r4506
 2011-06-28 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 
 	* include/styles/pandora.css
@@ -1448,7 +1454,6 @@
 	* pandoradb.postgreSQL.sql: fixed the type of cell "id_agente_modulo" in the
 	table "tagente_datos_string".
 
->>>>>>> .r4322
 2011-05-06  Dario Rodriguez <dario.rodriguez@artica.es>
 
 	* include/graphs/functions_gd.php: Added new parameter to function
diff --git a/pandora_console/godmode/massive/massive_add_action_alerts.php b/pandora_console/godmode/massive/massive_add_action_alerts.php
index 11a2ca80c6..561796122f 100644
--- a/pandora_console/godmode/massive/massive_add_action_alerts.php
+++ b/pandora_console/godmode/massive/massive_add_action_alerts.php
@@ -49,7 +49,7 @@ if (is_ajax ()) {
                        		$filter .= ' OR ';
                 	}
                 	$filter .= 'id_agent=' . $id_agent;
-        	};
+        	}
 			$alert_compounds = alerts_get_alert_compounds ($filter, array('id', 'name'));
 			echo json_encode (index_array ($alert_compounds, 'id', 'name'));
 			return;
@@ -177,7 +177,7 @@ else {
                         $filter .= ' OR ';
                 }
                 $filter .= 'id_agent=' . $id_agent;
-        };
+        }
 	$alert_compounds = alerts_get_alert_compounds ($filter, array('id', 'name'));
 }
 $table->data[3][0] = __('Alert compounds');
diff --git a/pandora_console/godmode/massive/massive_delete_action_alerts.php b/pandora_console/godmode/massive/massive_delete_action_alerts.php
index 96bbda8028..69bf1b05bc 100644
--- a/pandora_console/godmode/massive/massive_delete_action_alerts.php
+++ b/pandora_console/godmode/massive/massive_delete_action_alerts.php
@@ -48,7 +48,7 @@ if (is_ajax ()) {
 					$filter .= ' OR ';
 				}
 				$filter .= 'id_agent=' . $id_agent;
-			};
+			}
 			$alert_compounds = alerts_get_alert_compounds ($filter, array('id', 'name'));
 			echo json_encode (index_array ($alert_compounds, 'id', 'name'));
 			return;
@@ -184,7 +184,7 @@ if (empty($id_agents)) {
 			$filter .= ' OR ';
 		}
 		$filter .= 'id_agent=' . $id_agent;
-	};
+	}
 	$alert_compounds = alerts_get_alert_compounds ($filter, array('id', 'name'));
 }
 $table->data[3][0] = __('Alert compounds');
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 88c9f89a48..5d14679406 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -1376,7 +1376,7 @@ function html_print_autocomplete_modules($name = 'module', $default = '', $id_ag
 		var text = document.createTextNode(str);
 		div.appendChild(text);
 		return div.innerHTML;
-	};
+	}
 	
 		$(document).ready (function () {		
 			$("#text-<?php echo $name; ?>").autocomplete(
diff --git a/pandora_console/operation/reporting/reporting_xml.php b/pandora_console/operation/reporting/reporting_xml.php
index ef94f594ba..80abf7bb0c 100644
--- a/pandora_console/operation/reporting/reporting_xml.php
+++ b/pandora_console/operation/reporting/reporting_xml.php
@@ -169,7 +169,7 @@ $xml["group"]["name"] = io_safe_output_xml ($group_name);
 
 if ($contents === false) {
 	$contents = array ();
-};
+}
 
 xml_array ($xml);