← Back to team overview

openlp-core team mailing list archive

Thread
Date

Re: [Merge] lp:~sam92/openlp/verseorder-import into lp:openlp

To: mp+214723@xxxxxxxxxxxxxxxxxx
From: Samuel Mehrbrodt <s.mehrbrodt@xxxxxxxxx>
Date: Mon, 14 Apr 2014 19:36:52 -0000
In-reply-to: <20140408112223.13229.65958.launchpad@ackee.canonical.com>
Reply-to: mp+214723@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Can you please merge this branch first: https://code.launchpad.net/~sam92/openlp/bag_1225763/+merge/215568
There I've touched the same file, so there will be again a conflict with trunk if you merge this one first.
-- 
https://code.launchpad.net/~sam92/openlp/verseorder-import/+merge/214723
Your team OpenLP Core is subscribed to branch lp:openlp.

References

[Merge] lp:~sam92/openlp/verseorder-import into lp:openlp
From: Samuel Mehrbrodt, 2014-04-08