There are conflicts.
Your last commit http://bazaar.launchpad.net/~laetitia-gangloff/hr-timesheet/hr_attendance_analysis_externalise_contract_calendar/revision/54 did a lot of changes
I suggest to revert to revision 53 and make the changes related to line 235 only.
Thanks
« Back to merge proposal
There are conflicts.
Your last commit bazaar. launchpad. net/~laetitia- gangloff/ hr-timesheet/ hr_attendance_ analysis_ externalise_ contract_ calendar/ revision/ 54
http://
did a lot of changes
I suggest to revert to revision 53 and make the changes related to line 235 only.
Thanks