tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge error. Ticket #188

Browse Source
This commit is contained in:
Arturo Gonzalez 2017-01-25 11:17:14 +01:00
parent 969ce03f1d
commit 44ee8617f8
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/include/graphs/fgraph.php
View File

@ -267,14 +267,11 @@ function area_graph($flash_chart, $chart_data, $width, $height, $color,
$agent_module_id, $agent_module_id,
$font, $font,
$font_size, $font_size,
<<<<<<< HEAD
$xaxisname);
=======
$xaxisname, $xaxisname,
$percentil_values, $percentil_values,
$threshold_data $threshold_data
); );
>>>>>>> d3f5a6281... Fixed threshold in interface graphs. Ticket #156
} }
else { else {
$graph = array(); $graph = array();