← Back to team overview

openlp-core team mailing list archive

Thread
Date

Re: [Merge] lp:~wesleystout/openlp/documentation into lp:openlp

To: Wesley Stout <wesleystout@xxxxxxxxx>
From: Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>
Date: Tue, 26 Apr 2011 20:06:32 -0000
In-reply-to: <20110426183234.774.76165.launchpad@loganberry.canonical.com>
Reply-to: mp+59113@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Review: Needs Fixing
Oh, hrm, your file has a conflict. Just do a merge from an updated trunk, and then copy your image in again, and then resubmit please?
-- 
https://code.launchpad.net/~wesleystout/openlp/documentation/+merge/59113
Your team OpenLP Core is subscribed to branch lp:openlp.

References

[Merge] lp:~wesleystout/openlp/documentation into lp:openlp
From: Wesley Stout, 2011-04-26