[brasero] fix failed cherry-pick

[Philippe Rouquier <philippr src gnome org>]

commit 187036f393981592bb30d9c56f4a9dd38b4318df
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Wed Nov 4 17:49:14 2009 +0100

    fix failed cherry-pick

 libbrasero-utils/brasero-metadata.c |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)
---
diff --git a/libbrasero-utils/brasero-metadata.c b/libbrasero-utils/brasero-metadata.c
index 192d58f..96d8dd4 100644
--- a/libbrasero-utils/brasero-metadata.c
+++ b/libbrasero-utils/brasero-metadata.c
@@ -1003,14 +1003,6 @@ static void
 brasero_metadata_install_plugins_abort (BraseroMetadataGstDownload *download)
 {
 	GSList *iter;
-<<<<<<< HEAD:libbrasero-utils/brasero-metadata.c
-	BraseroMetadataPrivate *priv;
-
-	for (iter = download->objects; iter; iter = iter->next) {
-		priv = BRASERO_METADATA_PRIVATE (iter->data);
-		g_error_free (priv->error);
-		priv->error = NULL;
-=======
 	GSList *next;
 
 	for (iter = download->objects; iter; iter = next) {
@@ -1024,7 +1016,6 @@ brasero_metadata_install_plugins_abort (BraseroMetadataGstDownload *download)
 			g_error_free (priv->error);
 			priv->error = NULL;
 		}
->>>>>>> 1b7adc3... Fix a potential crash when aborting the download of a Gstreamer plugin throught PackageKit:libbrasero-utils/brasero-metadata.c
 
 		brasero_metadata_completed (BRASERO_METADATA (iter->data));
 	}