← Back to team overview

openerp-community-reviewer team mailing list archive

Re: OCB conflict: timesheet timezone vs. new attendances in confirmed timesheet

 

On 04/28/2014 04:39 PM, Yannick Vaucher wrote:
> Hello,
>
> Here is the conflict resolution for OCB
> https://code.launchpad.net/~camptocamp/ocb-addons/7.0-resolve-conflict-10015/+merge/217454
> <https://code.launchpad.net/%7Ecamptocamp/ocb-addons/7.0-resolve-conflict-10015/+merge/217454>
>
>
> Please give it some love.

Hi Yannick,

As you have found out, Martin from OpenERP has beaten to us and merged
it almost immediately. As a result, thanks to you and Martin the replay
process has been running again just now and we did not lose a single
bugfix ;-)

Thank you for your excellent and blazing fast response!

Cheers,
Stefan.


-- 
Therp - Maatwerk in open ontwikkeling

Stefan Rijnhart - Ontwerp en implementatie

mail: stefan@xxxxxxxx
tel: +31 (0) 614478606
http://therp.nl
https://twitter.com/therp_stefan



Follow ups

References