← Back to team overview

openlp-core team mailing list archive

Thread
Date

Re: [Merge] lp:~alisonken1/openlp/pjlink2-n into lp:openlp

To: Ken Roberts <alisonken1@xxxxxxxxx>
From: Raoul Snyman <raoul@xxxxxxxxxxx>
Date: Tue, 02 Jan 2018 23:59:06 -0000
In-reply-to: <151426400227.28129.8728388362206688975.launchpad@ackee.canonical.com>
Reply-to: mp+335591@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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.

References

[Merge] lp:~alisonken1/openlp/pjlink2-n into lp:openlp
From: Ken Roberts, 2017-12-26