From 30cc41955b7108533a085dff60ad176a06a774ba Mon Sep 17 00:00:00 2001 From: Matthieu Haineault Date: Thu, 13 Nov 2025 13:54:01 -0500 Subject: [PATCH] fix():fix merge --- .../shifts/services/shifts-update-delete.service.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/time-and-attendance/time-tracker/shifts/services/shifts-update-delete.service.ts b/src/time-and-attendance/time-tracker/shifts/services/shifts-update-delete.service.ts index 9955ea4..fed71ae 100644 --- a/src/time-and-attendance/time-tracker/shifts/services/shifts-update-delete.service.ts +++ b/src/time-and-attendance/time-tracker/shifts/services/shifts-update-delete.service.ts @@ -163,14 +163,8 @@ export class ShiftsUpdateDeleteService { for (let j = i + 1; j < shifts.length; j++) { const shift_a = shifts[i]; const shift_b = shifts[j]; -<<<<<<< HEAD - - if (shift_a.date !== shift_b.date) continue; - if (shift_a.id === shift_b.id) continue; -======= if (shift_a.date !== shift_b.date || shift_a.id === shift_b.id) continue; ->>>>>>> 37b150d87c98746a3cb23bbe36ee9e364c6a613d const has_overlap = overlaps( { start: toHHmmFromString(shift_a.start_time), end: toHHmmFromString(shift_a.end_time) }, { start: toHHmmFromString(shift_b.start_time), end: toHHmmFromString(shift_b.end_time) },