← Back to team overview

openlp-core team mailing list archive

Thread
Date

Re: [Merge] lp:~raoul-snyman/openlp/update-mock into lp:openlp

To: Raoul Snyman <raoul@xxxxxxxxxxx>
From: Raoul Snyman <raoul@xxxxxxxxxxx>
Date: Sat, 05 Oct 2013 17:56:55 -0000
In-reply-to: <20131004223825.18285.30248.launchpad@ackee.canonical.com>
Reply-to: mp+189441@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

What conflict? I don't see a conflict in the diff below.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/update-mock/+merge/189441
Your team OpenLP Core is subscribed to branch lp:openlp.

References

[Merge] lp:~raoul-snyman/openlp/update-mock into lp:openlp
From: Raoul Snyman, 2013-10-04