Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Import fix
--
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/29159
Your team OpenLP Core is requested to review the proposed merge of
lp:~meths/openlp/trivialfixes into lp:openlp.
=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py 2010-07-02 12:13:46 +0000
+++ openlp/plugins/songs/lib/mediaitem.py 2010-07-03 23:12:28 +0000
@@ -27,11 +27,11 @@
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import MediaManagerItem, SongXMLParser, \
- BaseListWithDnD, Receiver, ItemCapabilities, translate, check_item_selected
+from openlp.core.lib import MediaManagerItem, SongXMLParser, Receiver, \
+ BaseListWithDnD, ItemCapabilities, translate, check_item_selected
from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm, \
ImportWizardForm
-from openlp.plugins.songs.lib.db import Song
+from openlp.plugins.songs.lib.db import Author, Song
log = logging.getLogger(__name__)
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
