openerp-dev-web team mailing list archive

Thread
Date

Re: [Merge] lp:~openerp-dev/openobject-client-web/6.0-opw-4311-sma into lp:openobject-client-web

To: "Sananaz \(Open ERP\)" <sma@xxxxxxxxxxx>
From: "Xavier \(Open ERP\)" <xmo@xxxxxxxxxxx>
Date: Wed, 16 Mar 2011 13:31:07 -0000
In-reply-to: <20110315134021.20606.32998.launchpad@loganberry.canonical.com>
Reply-to: mp+53439@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Review: Resubmit
Please submit the branch for merge in lp:openobject-client-web/6.0, as you can see above there are conflicts between the translation files of trunk and 6.0 so the diff is unreadable.
-- 
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-opw-4311-sma/+merge/53439
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-client-web/6.0-opw-4311-sma.

References

[Merge] lp:~openerp-dev/openobject-client-web/6.0-opw-4311-sma into lp:openobject-client-web
From: Sananaz (Open ERP), 2011-03-15