diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2011-03-16 17:05:59 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2011-03-16 17:05:59 -0400 |
| commit | 6f97976326e7ca648b3fe99f8038b735878d723e (patch) | |
| tree | 5933f8f955e4d70cd2064b9f0452258b861f45a1 /usr/local/www | |
| parent | aff70640bfe35f14176b6134359f05d565c83511 (diff) | |
| parent | af4c040e43f2c2e7bd2701b106fa7bf6aac288cd (diff) | |
| download | pfsense-6f97976326e7ca648b3fe99f8038b735878d723e.zip pfsense-6f97976326e7ca648b3fe99f8038b735878d723e.tar.gz | |
Fix merge conflict
Diffstat (limited to 'usr/local/www')
| -rw-r--r-- | usr/local/www/status_rrd_graph_img.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php index 2838a68..bc6bd1b 100644 --- a/usr/local/www/status_rrd_graph_img.php +++ b/usr/local/www/status_rrd_graph_img.php @@ -640,7 +640,7 @@ elseif((strstr($curdatabase, "-packets.rrd")) && (file_exists("$rrddbpath$curdat $graphcmd .= "GPRINT:\"$curif-in_pps_block:LAST:%7.2lf %S pps\" "; $graphcmd .= "GPRINT:\"$curif-pps_in_t_block:AVERAGE:%7.2lf %s pkts\" "; $graphcmd .= "COMMENT:\"\\n\" "; - $graphcmd .= "COMMENT:\"out-pass\t\" "; + $graphcmd .= "COMMENT:\"out-block\t\" "; $graphcmd .= "GPRINT:\"$curif-out_pps_block:MAX:%7.2lf %s pps\" "; $graphcmd .= "GPRINT:\"$curif-out_pps_block:AVERAGE:%7.2lf %S pps\" "; $graphcmd .= "GPRINT:\"$curif-out_pps_block:LAST:%7.2lf %S pps\" "; |
