raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix merge

This commit is contained in:
Samuel Mehrbrodt 2014-03-31 20:49:47 +02:00
parent 8b7bbb4761
commit 81a8868a5a
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/ui/servicemanager.py
View File

@ -1487,7 +1487,6 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
if new_item: if new_item:
self.add_service_item(new_item, replace=True) self.add_service_item(new_item, replace=True)
<<<<<<< TREE
def on_service_item_rename(self): def on_service_item_rename(self):
""" """
Opens a dialog to rename the service item. Opens a dialog to rename the service item.
@ -1503,10 +1502,7 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
self.repaint_service_list(item, -1) self.repaint_service_list(item, -1)
self.set_modified() self.set_modified()
def create_custom(self):
=======
def create_custom(self, field=None): def create_custom(self, field=None):
>>>>>>> MERGE-SOURCE
""" """
Saves the current text item as a custom slide Saves the current text item as a custom slide
:param field: :param field: