← Back to team overview

openlp-core team mailing list archive

Thread
Date

Re: [Merge] lp:~orangeshirt/openlp/bibles into lp:openlp

To: mp+100859@xxxxxxxxxxxxxxxxxx
From: Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>
Date: Thu, 05 Apr 2012 16:47:24 -0000
In-reply-to: <20120404193723.13219.3631.launchpad@ackee.canonical.com>
Reply-to: mp+100859@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Review: Resubmit

You have a conflict in openlp/plugins/bibles/forms/__init__.py

Please fix this conflict and resubmit.
-- 
https://code.launchpad.net/~orangeshirt/openlp/bibles/+merge/100859
Your team OpenLP Core is subscribed to branch lp:openlp.

References

[Merge] lp:~orangeshirt/openlp/bibles into lp:openlp
From: Armin Köhler, 2012-04-04