mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-28 16:24:54 +02:00
fixed conflict
This commit is contained in:
parent
6b14754137
commit
1d726d59f3
@ -824,7 +824,6 @@ function ui_format_alert_row ($alert, $agent = true, $url = '', $agent_style = f
|
|||||||
return array ("", "", "", "", "", "", "");
|
return array ("", "", "", "", "", "", "");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (defined('METACONSOLE')) {
|
if (defined('METACONSOLE')) {
|
||||||
|
|
||||||
$server = db_get_row ('tmetaconsole_setup', 'id', $alert['server_data']['id']);
|
$server = db_get_row ('tmetaconsole_setup', 'id', $alert['server_data']['id']);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user