From c8226bf2fc00c14b5d7d5ed21ca6f9d5eeda0877 Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Wed, 4 Nov 2009 23:13:17 +0000
Subject: [PATCH] Fix mismerge

---
 openlp/core/lib/mediamanageritem.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index 5c2f0eec6..722d5756e 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -377,7 +377,6 @@ class MediaManagerItem(QtGui.QWidget):
         service_item = self.buildServiceItem()
         if service_item:
             service_item.fromPlugin = True
-            service_item.uuid = unicode(uuid.uuid1())
             self.parent.live_controller.addServiceItem(service_item)
 
     def onAddClick(self):