The attached debdiff when applied to the Debian sources processes the merge.
** Attachment added: "debdiff for merge" http://librarian.launchpad.net/7451316/M110766.patch -- Please merge blobwars 1.06-2-2 from Debian unstable https://bugs.launchpad.net/bugs/110766 You received this bug notification because you are a member of Ubuntu Bugs, which is the bug contact for Ubuntu. -- ubuntu-bugs mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
