There are four conflicts with my branch. Can you either wait with this or revert the changes?
Text conflict in openlp/core/ui/printservicedialog.py Text conflict in openlp/plugins/songs/forms/authorsform.py Text conflict in openlp/plugins/songs/forms/editsongdialog.py Text conflict in openlp/plugins/songs/forms/editsongform.py -- https://code.launchpad.net/~raoul-snyman/openlp/cleanups/+merge/152166 Your team OpenLP Core is subscribed to branch lp:openlp. _______________________________________________ Mailing list: https://launchpad.net/~openlp-core Post to : [email protected] Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
