Kinda surprised the merge failed. I resolved the conflict by selecting 'resolve using other', which should have just taken your copy as is.
On Thu, Apr 17, 2014 at 3:00 PM, <[email protected]> wrote: > The proposal to merge lp:~mterry/duplicity/fix-drop-u1 into lp:duplicity > has been updated. > > Status: Needs review => Merged > > For more details, see: > https://code.launchpad.net/~mterry/duplicity/fix-drop-u1/+merge/216387 > -- > https://code.launchpad.net/~mterry/duplicity/fix-drop-u1/+merge/216387 > Your team duplicity-team is requested to review the proposed merge of > lp:~mterry/duplicity/fix-drop-u1 into lp:duplicity. > > _______________________________________________ > Mailing list: https://launchpad.net/~duplicity-team > Post to : [email protected] > Unsubscribe : https://launchpad.net/~duplicity-team > More help : https://help.launchpad.net/ListHelp > -- https://code.launchpad.net/~mterry/duplicity/fix-drop-u1/+merge/216387 Your team duplicity-team is requested to review the proposed merge of lp:~mterry/duplicity/fix-drop-u1 into lp:duplicity. _______________________________________________ Mailing list: https://launchpad.net/~duplicity-team Post to : [email protected] Unsubscribe : https://launchpad.net/~duplicity-team More help : https://help.launchpad.net/ListHelp
