ubuntu-manual-bugs team mailing list archive

["Jason.Cook599" <616130@xxxxxxxxxxxxxxxxxx>]

After looking at the the changes in r153[1] (the push I made the fix the
merge problem), you can tell, the merge problem is in the same spot now
and when I fixed it.

[1]http://bazaar.launchpad.net/~ubuntu-manual/ubuntu-
manual/lucid-e2/revision/153#around-desktop/around-desktop.tex

-- 
Merge Problem
https://bugs.launchpad.net/bugs/616130
You received this bug notification because you are a member of Ubuntu
Manual Bugs, which is subscribed to Ubuntu Manual.

Status in Ubuntu Manual: In Progress

Bug description:
In "The Ubuntu Desktop" there is some <<<< >>>> characters where a merge failed. 

So there are two versions of the text.

I need to check and remove one version.

This is a not to myself to fix.