© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
bbfa235
(Get the code!)
As per comment 3, the branch you need to use is the one on the ubuntu-docs project and not on the ubuntu project. It looks like you are proposing the merge on the ubuntu project, which may be why you have the conflicts.
No need to touch the changelog, we will group together various fixes in a single upload later in the cycle.