ubuntu-manual team mailing list archive

[lafeber-dumoleyn2 <lafeber-dumoleyn2@xxxxxxxxx>]

Hello Chris,
Sorry for the problems I caused yesterday. I have solved it by copying
my latest ubuntu-desktop.tex file to my /Projects/natty folder and then
doing the following:
1. bzr pull    Message: Now on revision 33
2. bzr commit -m "ubuntu-desktop search 8-25-11"    Message: Committed
revision 34
3. bzr launchpad-login, followed by bzr push etc.
I hope it is ok now.
Greets,
Hannie

Op woensdag 24-08-2011 om 22:12 uur [tijdzone +0100], schreef Chris
Woollard:

> Hannie,
> 
> 
> 
> I notice that you did a merge that included ubuntu-desktop.tex
> earlier.
> 
> 
> Can you checkout the file in the manual branch. There appears to be a
> couple of paragraphs that bzr couldn't decide which was the correct
> version.
> 
> 
> they are marked with <<<< and ====
> 
> 
> 
> 
> Can you take a look and make the required fixes.
> 
> 
> thanks
> Chris
> 
> 
> 
> _______________________________________________
> Mailing list: https://launchpad.net/~ubuntu-manual
> Post to     : ubuntu-manual@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~ubuntu-manual
> More help   : https://help.launchpad.net/ListHelp