Review: Resubmit Actually, I'm getting a conflict in trunk, can you just merge from trunk and resolve that conflict please? -- https://code.launchpad.net/~alisonken1/openlp/pjlink2-n/+merge/335591 Your team OpenLP Core is subscribed to branch lp:openlp.
_______________________________________________ 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
