← Back to team overview

openlp-core team mailing list archive

Thread
Date

Re: [Merge] lp:~phill-ridout/openlp/TODOne into lp:openlp

To: mp+324887@xxxxxxxxxxxxxxxxxx
From: Raoul Snyman <raoul@xxxxxxxxxxx>
Date: Thu, 01 Jun 2017 05:43:11 -0000
In-reply-to: <20170531194037.16346.85169.launchpad@ackee.canonical.com>
Reply-to: mp+324887@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Review: Needs Fixing

I'm afraid you have a conflict :-(

Text conflict in openlp/core/ui/lib/pathedit.py
-- 
https://code.launchpad.net/~phill-ridout/openlp/TODOne/+merge/324887
Your team OpenLP Core is subscribed to branch lp:openlp.

References

[Merge] lp:~phill-ridout/openlp/TODOne into lp:openlp
From: Phill, 2017-05-31