openlp-core team mailing list archive

[Wesley Stout <wesleystout@xxxxxxxxx>]

Andreas,

I'm new at this I just did what you told me to but if I'm not mistaken I
should have done that before, so I need to find the conflicts now and repair
them ?

thanks

Wesley

On Tue, Nov 30, 2010 at 11:18 AM, Wesley Stout <wesleystout@xxxxxxxxx>wrote:

> Andreas thanks... I may need some hand holding on this one :) but will give
> it a try!
>
> On Tue, Nov 30, 2010 at 11:15 AM, Andreas Preikschat <
> andreaspreikschat@xxxxxxxxxx> wrote:
>
> > (replace "trivial" by the branch name)
> > --
> >
> https://code.launchpad.net/~wesleystout/openlp/documentation/+merge/42270
> > You are the owner of lp:~wesleystout/openlp/documentation.
> >
>
> --
> https://code.launchpad.net/~wesleystout/openlp/documentation/+merge/42270
> You are the owner of lp:~wesleystout/openlp/documentation.
>

-- 
https://code.launchpad.net/~wesleystout/openlp/documentation/+merge/42270
Your team OpenLP Core is requested to review the proposed merge of lp:~wesleystout/openlp/documentation into lp:openlp.