Can you please merge this branch first: https://code.launchpad.net/~sam92/openlp/bag_1225763/+merge/215568 There I've touched the same file, so there will be again a conflict with trunk if you merge this one first. -- https://code.launchpad.net/~sam92/openlp/verseorder-import/+merge/214723 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
