From 379131f3e2aab070bdac8f4a6cd57071c4d7b8c6 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Thu, 15 Dec 2016 08:24:04 +0100
Subject: [PATCH] fixed error merge git

---
 pandora_console/include/functions_reporting.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 6ac2faf7aa..f44d1ed603 100644
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -454,8 +454,6 @@ function reporting_make_reporting_data($report = null, $id_report,
 					$report,
 					$content);
 				break;
-<<<<<<< HEAD
-=======
 			case 'SLA_weekly':
 				$report['contents'][] = reporting_enterprise_sla_weekly(
 					$report,
@@ -466,7 +464,6 @@ function reporting_make_reporting_data($report = null, $id_report,
 					$report,
 					$content);
 				break;
->>>>>>> 2b0820d... add new reports sla_hourly , weekly and availability graph
 			case 'SLA_services':
 				$report['contents'][] = reporting_enterprise_sla_services_refactoriced(
 					$report,