← Back to team overview

openerp-community team mailing list archive

Thread
Date

Re: lp:~akretion-team/openerp-product-attributes/mixin-extraction into lp:openerp-product-attributes

To: mp+151333@xxxxxxxxxxxxxxxxxx
From: "Guewen Baconnier @ Camptocamp" <guewen.baconnier@xxxxxxxxxxxxxx>
Date: Mon, 29 Apr 2013 08:46:39 -0000
In-reply-to: <20130302001528.22168.909.launchpad@ackee.canonical.com>
Reply-to: mp+151333@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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.

References

[Merge] lp:~akretion-team/openerp-product-attributes/mixin-extraction into lp:openerp-product-attributes
From: Raphaël Valyi - http : //www . akretion . com, 2013-03-02