Fix mismerge

This commit is contained in:
Jon Tibble 2009-11-04 23:13:17 +00:00
parent 0ea45cd366
commit c8226bf2fc

View File

@ -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):