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@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-manual More help : https://help.launchpad.net/ListHelp
