The 7.0 branch will have the same issue, the 'common ancestor' of the branches have to be the same than the extra-addons otherwise the merges won't work correctly. -- https://code.launchpad.net/~joao-gama/openerp-product-attributes/product_weight/+merge/143710 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
