← Back to team overview

openlp-core team mailing list archive

Thread
Date

Re: [Merge] lp:~smpettit/openlp/data-path into lp:openlp

To: mp+109423@xxxxxxxxxxxxxxxxxx
From: Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>
Date: Fri, 08 Jun 2012 21:53:19 -0000
In-reply-to: <20120608194320.22959.86481.launchpad@ackee.canonical.com>
Reply-to: mp+109423@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Review: Resubmit

You have a conflict. Please merge trunk into your branch, resolve the conflict, and resubmit.
-- 
https://code.launchpad.net/~smpettit/openlp/data-path/+merge/109423
Your team OpenLP Core is subscribed to branch lp:openlp.

References

[Merge] lp:~smpettit/openlp/data-path into lp:openlp
From: Stevan Pettit, 2012-06-08