From 222f10ba4574db947adbd812e9b8d969b1738e8e Mon Sep 17 00:00:00 2001
From: Martin Thompson <martinthompson@openlp.org>
Date: Wed, 14 Jul 2010 21:52:45 +0100
Subject: [PATCH] Now fixed the trunk merge

---
 openlp/plugins/songs/songsplugin.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
index b9129be7a..ab36d13d0 100644
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -233,10 +233,6 @@ class SongsPlugin(Plugin):
             'This plugin allows songs to be managed and displayed.')
         return about_text
 
-    def canDeleteTheme(self, theme_name):
-        if not self.manager.get_all_objects_filtered(Song,
-            Song.theme_name == theme_name):
-
     def usesTheme(self, theme):
         """
         Called to find out if the song plugin is currently using a theme.