openerp-community-reviewer team mailing list archive

[Lorenzo Battistini - Agile BG <lorenzo.battistini@xxxxxxxxxxx>]

On 11/04/2013 09:49 AM, Stefan Rijnhart (Therp) wrote:
> @Maxime: while this would be OK on regular community projects, on OCB projects modifying the change at merge time could cause a conflict because the proposal on upstream does not contain such modifications. In order to prevent the conflict, the space needs to be added to both proposed branches or we be lenient and ignore the occasional PEP8 glitch.

Space added to both proposed branches :-)

-- 
https://code.launchpad.net/~elbati/ocb-addons/7.0_fix_1181291_elbati/+merge/169352
Your team OpenERP Community Backports Team is subscribed to branch lp:ocb-addons.