Conflicts has been resolved by merging lp:~openerp-dev/openobject-addons/trunk-import_salesforce
Kindly review this -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-import_salesforce-b9_contact-jam/+merge/66992 Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-import_salesforce. _______________________________________________ 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
