From 2dc091de47ce69bab5990424c5441a0059ea2645 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Thu, 20 Jan 2011 06:42:44 +0100 Subject: [PATCH] commit fix --- openlp/plugins/songs/forms/songmaintenanceform.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openlp/plugins/songs/forms/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py index fefd3ed33..7da8ddd81 100644 --- a/openlp/plugins/songs/forms/songmaintenanceform.py +++ b/openlp/plugins/songs/forms/songmaintenanceform.py @@ -395,7 +395,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): Merges two authors into one author. ``old_author`` - The author, which was edited. It will be deleted. + The object, which was edited, that will be deleted """ # Find the duplicate. existing_author = self.manager.get_object_filtered(Author, @@ -419,7 +419,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): Merges two topics into one topic. ``old_topic`` - The topic, which was edited. It will be deleted. + The object, which was edited, that will be deleted """ # Find the duplicate. existing_topic = self.manager.get_object_filtered(Topic, @@ -441,7 +441,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): Merges two books into one book. ``old_book`` - The book, which was edited. It will be deleted. + The object, which was edited, that will be deleted """ # Find the duplicate. existing_book = self.manager.get_object_filtered(Book,