** Summary changed: - merging generated conflicts which should be handled + merging generated conflicts which were resolved in merged branch
-- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/906370 Title: merging generated conflicts which were resolved in merged branch To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/bzr/+bug/906370/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
