ubuntu-manual-bugs team mailing list archive

[Kevin Godby <godbyk@xxxxxxxxx>]

Yes, it appears the failed merge stuff was committed in r153.

-- 
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.