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

fixed error merge git

This commit is contained in:
daniel 2016-12-15 08:24:04 +01:00
parent 51f83ba579
commit 379131f3e2
1 changed files with 0 additions and 3 deletions
pandora_console/include
functions_reporting.php

3
pandora_console/include/functions_reporting.php
View File

@ -454,8 +454,6 @@ function reporting_make_reporting_data($report = null, $id_report,
$report, $report,
$content); $content);
break; break;
<<<<<<< HEAD
=======
case 'SLA_weekly': case 'SLA_weekly':
$report['contents'][] = reporting_enterprise_sla_weekly( $report['contents'][] = reporting_enterprise_sla_weekly(
$report, $report,
@ -466,7 +464,6 @@ function reporting_make_reporting_data($report = null, $id_report,
$report, $report,
$content); $content);
break; break;
>>>>>>> 2b0820d... add new reports sla_hourly , weekly and availability graph
case 'SLA_services': case 'SLA_services':
$report['contents'][] = reporting_enterprise_sla_services_refactoriced( $report['contents'][] = reporting_enterprise_sla_services_refactoriced(
$report, $report,