openerp-community-reviewer team mailing list archive

Thread
Date

Re: [Merge] lp:~camptocamp/ocb-addons/7.0-fix-1220732 into lp:ocb-addons

To: mp+183911@xxxxxxxxxxxxxxxxxx
From: "Yannick Vaucher @ Camptocamp" <yannick.vaucher@xxxxxxxxxxxxxx>
Date: Thu, 17 Oct 2013 07:52:52 -0000
In-reply-to: <20131016170046.27618.76936.launchpad@ackee.canonical.com>
Reply-to: mp+183911@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

I synched the 2 conflicting files to ensure merge will pass (tested) I don't think reverse commit  is necessary.

By the way the rml indentation is awful :( And I compared the sxw files there are no changes but the date of edition and the size of file...
-- 
https://code.launchpad.net/~camptocamp/ocb-addons/7.0-fix-1220732/+merge/183911
Your team OpenERP Community Backports Team is subscribed to branch lp:ocb-addons.

References

[Merge] lp:~camptocamp/ocb-addons/7.0-fix-1220732 into lp:ocb-addons
From: Yannick Vaucher @ Camptocamp, 2013-10-16