should be good now, must have been a later merge adjusting imports on one file.
On Sat, Feb 1, 2014 at 2:38 AM, Guewen Baconnier @ Camptocamp <[email protected]> wrote: > Review: Resubmit > > I couldn't merge due to a conflict. Can you check and rebase please? Thanks > -- > https://code.launchpad.net/~gdgellatly/banking-addons/banking-addons-reconcile-minor-import-fixes/+merge/200475 > You are the owner of > lp:~gdgellatly/banking-addons/banking-addons-reconcile-minor-import-fixes. -- https://code.launchpad.net/~gdgellatly/banking-addons/banking-addons-reconcile-minor-import-fixes/+merge/200475 Your team Banking Addons Core Editors is subscribed to branch lp:banking-addons/bank-statement-reconcile-7.0. -- Mailing list: https://launchpad.net/~banking-addons-team Post to : [email protected] Unsubscribe : https://launchpad.net/~banking-addons-team More help : https://help.launchpad.net/ListHelp
