Watch out, you have a conflict. You might want to merge from trunk into your branch sometime and fix the conflict. -- https://code.launchpad.net/~mjthompson/openlp/opensong_import/+merge/29148 Your team OpenLP Core is requested to review the proposed merge of lp:~mjthompson/openlp/opensong_import into 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
