From c605536b33372532c55515b66ca83fe4bc275d97 Mon Sep 17 00:00:00 2001
From: juanmanuelr <noreply@pandorafms.org>
Date: Tue, 29 Nov 2011 16:12:20 +0000
Subject: [PATCH] 2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>

	* include/functions_graph.php
	include/functions_graph.php: Fixed PDF exportation of combined
	graphs.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5206 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                   | 6 ++++++
 pandora_console/include/functions_graph.php | 5 +----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 837b4cb8fb..ff20a444ca 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* include/functions_graph.php
+	include/functions_graph.php: Fixed PDF exportation of combined 
+	graphs.
+
 2011-11-29 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 
 	* operation/events/events_list.php: Resized graph in this view.
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 0f4192aee4..771f575936 100755
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -741,19 +741,16 @@ function graphic_combined_module ($module_list, $weight_list, $period, $width, $
 	if ($only_image) {
 		$flash_charts = false;
 	}
-<<<<<<< .mine
+
 			
 	if ($flash_charts){
 		include_flash_chart_script();
 	}	
 	
-=======
-			
 	if ($flash_charts){
 		include_flash_chart_script();
 	}	
 
->>>>>>> .r5204
 	switch ($stacked) {
 		case GRAPH_AREA:
 			$color = null;