diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 895872ed37..6e661bee24 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,5 +1,7 @@
 2008-06-19  Sancho Lerena  <slerena@gmail.com>
 
+	* Fixed bad conflict resolution commit in functions_db.php
+
 	* include/functions_reporting.php
 	include/config.php
 	include/functions.php
diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php
index 7a461de483..5693394d9d 100644
--- a/pandora_console/include/functions_db.php
+++ b/pandora_console/include/functions_db.php
@@ -943,7 +943,6 @@ function show_icon_type ($id_type) {
  * @param int Server type id
  * @return string Fully formatted  IMG HTML tag with icon
  */
-<<<<<<< .mine
 
 function show_server_type ($id){ 
     global $config;