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;