openerp-chinese-team team mailing list archive
-
openerp-chinese-team team
-
Mailing list archive
-
Message #00199
Re: lp:~openerp-chinese-team/magentoerpconnect/guest-order-bug-fix into lp:magentoerpconnect/oerp6.1-stable
Review: Resubmit
Hello,
Your merge proposal is conflicting against the current code. Can you rebase your branch and propose your merge again please?
By the way, you'll want to check because it seems to have been fixed in a different manner on the main branch.
Thanks for your proposal
--
https://code.launchpad.net/~openerp-chinese-team/magentoerpconnect/guest-order-bug-fix/+merge/131813
Your team Open ERP Chinese is subscribed to branch lp:~openerp-chinese-team/magentoerpconnect/guest-order-bug-fix.
References