I tried to merge lp:~akretion-team/openerp-product-attributes/polymorphic-relations, then this branch, but when I merge this one I have a conflict. Can you check why please?
-- https://code.launchpad.net/~akretion-team/openerp-product-attributes/mixin-extraction/+merge/151333 Your team OpenERP Community is subscribed to branch lp:openerp-product-attributes. _______________________________________________ Mailing list: https://launchpad.net/~openerp-community Post to : [email protected] Unsubscribe : https://launchpad.net/~openerp-community More help : https://help.launchpad.net/ListHelp
