From 81a8868a5a26bc8005a3d135d28f95337c2903d3 Mon Sep 17 00:00:00 2001
From: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Date: Mon, 31 Mar 2014 20:49:47 +0200
Subject: [PATCH] Fix merge

---
 openlp/core/ui/servicemanager.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 4e60cf19e..60e725103 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -1487,7 +1487,6 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
             if new_item:
                 self.add_service_item(new_item, replace=True)
 
-<<<<<<< TREE
     def on_service_item_rename(self):
         """
         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.set_modified()
 
-    def create_custom(self):
-=======
     def create_custom(self, field=None):
->>>>>>> MERGE-SOURCE
         """
         Saves the current text item as a custom slide
         :param field: