← Back to team overview

openlp-core team mailing list archive

Thread
Date

Re: [Merge] lp:~alisonken1/openlp/strings_projector_ui into lp:openlp

To: Ken Roberts <alisonken1@xxxxxxxxx>
From: Raoul Snyman <raoul@xxxxxxxxxxx>
Date: Thu, 21 Apr 2016 20:58:22 -0000
In-reply-to: <20160418124223.4740.96109.launchpad@ackee.canonical.com>
Reply-to: mp+292145@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Hey Ken, it looks like you have some conflicts. Merge from trunk, resolve your conflicts, and then resubmit your proposal. Thanks!
-- 
https://code.launchpad.net/~alisonken1/openlp/strings_projector_ui/+merge/292145
Your team OpenLP Core is subscribed to branch lp:openlp.

References

[Merge] lp:~alisonken1/openlp/strings_projector_ui into lp:openlp
From: Ken Roberts, 2016-04-18