From f4757999f41e76cf7948e8f105da3fdc61ccd2d2 Mon Sep 17 00:00:00 2001 From: slerena Date: Thu, 19 Jun 2008 14:38:18 +0000 Subject: [PATCH] 2008-06-19 Sancho Lerena * Fixed bad conflict resolution commit in functions_db.php git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@886 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 2 ++ pandora_console/include/functions_db.php | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) 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 + * 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;