← Back to team overview

ubuntu-manual team mailing list archive

Ubuntu-Desktop.tex merge



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.


Follow ups