← Back to team overview

openlp-core team mailing list archive

Thread
Date

Re: [Merge] lp:~mjthompson/openlp/opensong_import into lp:openlp

To: Martin Thompson <martin@xxxxxxxxxxxxxxxxxx>
From: Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>
Date: Sun, 04 Jul 2010 16:05:44 -0000
In-reply-to: <20100703140128.1838.73149.launchpad@loganberry.canonical.com>
Reply-to: mp+29148@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Watch out, you have a conflict. You might want to merge from trunk into your branch sometime and fix the conflict.
-- 
https://code.launchpad.net/~mjthompson/openlp/opensong_import/+merge/29148
Your team OpenLP Core is requested to review the proposed merge of lp:~mjthompson/openlp/opensong_import into lp:openlp.

Follow ups

Re: [Merge] lp:~mjthompson/openlp/opensong_import into lp:openlp
From: Martin Thompson, 2010-07-05

References

[Merge] lp:~mjthompson/openlp/opensong_import into lp:openlp
From: Martin Thompson, 2010-07-03