I have re-merged with Debian in the same bionic branch. (Next time I do a merge like this that gets stuck, I should use a different branch name so that 'bionic' could actually represent what is currently in 'bionic'.)
dns-manager-don-t-merge-split-DNS-search-domains.patch won't even apply now. The merge also includes the postinst fix from 1.8.4-1ubuntu4. I have dropped the 3 Ubuntu Phone related patches Tony Espy mentioned today. And I've dropped the diff that disabled libteam support now that the libteam MIR was approved. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1734586 Title: Merge NetworkManager with Debian 1.10.0-1 To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1734586/+subscriptions -- ubuntu-bugs mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
