← Back to team overview

openlp-core team mailing list archive

Thread
Date

Re: [Merge] lp:~smpettit/openlp/Packaging into lp:openlp

To: mp+59815@xxxxxxxxxxxxxxxxxx
From: Tim Bentley <tim.bentley@xxxxxxxxx>
Date: Wed, 04 May 2011 13:54:23 -0000
In-reply-to: <20110503185228.9243.57630.launchpad@loganberry.canonical.com>
Reply-to: mp+59815@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Review: Needs Fixing
You have merge conflicts in your tree.
Update your local version from trunk and resubmit
-- 
https://code.launchpad.net/~smpettit/openlp/Packaging/+merge/59815
Your team OpenLP Core is subscribed to branch lp:openlp.

References

[Merge] lp:~smpettit/openlp/Packaging into lp:openlp
From: Stevan Pettit, 2011-05-03