forked from openlp/openlp
Fix mismerge
This commit is contained in:
parent
0ea45cd366
commit
c8226bf2fc
@ -377,7 +377,6 @@ class MediaManagerItem(QtGui.QWidget):
|
|||||||
service_item = self.buildServiceItem()
|
service_item = self.buildServiceItem()
|
||||||
if service_item:
|
if service_item:
|
||||||
service_item.fromPlugin = True
|
service_item.fromPlugin = True
|
||||||
service_item.uuid = unicode(uuid.uuid1())
|
|
||||||
self.parent.live_controller.addServiceItem(service_item)
|
self.parent.live_controller.addServiceItem(service_item)
|
||||||
|
|
||||||
def onAddClick(self):
|
def onAddClick(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user