tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2008-06-19 Sancho Lerena <slerena@gmail.com> 

* 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
This commit is contained in:
slerena 2008-06-19 14:38:18 +00:00
parent 3b78e0799c
commit f4757999f4
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/ChangeLog
View File

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

1
pandora_console/include/functions_db.php
View File

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