fixed error merge git
This commit is contained in:
parent
51f83ba579
commit
379131f3e2
pandora_console/include
|
@ -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,
|
||||||
|
|
Loading…
Reference in New Issue