Can you merge with main branch to resolve conflict ?
-- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-import_quickbooks-sale-order-kjo/+merge/74090 Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-import_quickbooks. _______________________________________________ Mailing list: https://launchpad.net/~openerp-dev-gtk Post to : [email protected] Unsubscribe : https://launchpad.net/~openerp-dev-gtk More help : https://help.launchpad.net/ListHelp
