If you are talking about the "./around-desktop/around-desktop.tex" file, that was a merge that failed in my pull/commit/push. I cleaned up three different spots where the merge failed. This is a different failed merge, though I don't know if it is in the same or a different spot in the file.
I don't know weather or not this is related to these problems, but in the pull/commit/push that caused my problem, there was a lock on the branch. Normally I would have waited a little while for the lock to be removed, but as the branch had been lock for 64 minutes, so I manually broke the lock. -- 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. _______________________________________________ Mailing list: https://launchpad.net/~ubuntu-manual-bugs Post to : [email protected] Unsubscribe : https://launchpad.net/~ubuntu-manual-bugs More help : https://help.launchpad.net/ListHelp
