> conflicts in the branch. > please resolve it. Hello sir,
Conflicts are due to the changes in main addons branch(lp:openobject-addons). Can you please merge main branch to this branch to remove these conflicts. Thanks, Purnendu Singh -- https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-744789-qdp/+merge/58334 Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-744789-qdp. _______________________________________________ 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
