From a5e6cab248a273233bbe84d7bc6c183772cf331a Mon Sep 17 00:00:00 2001 From: Marshal Date: Thu, 20 Aug 2026 18:16:03 +0000 Subject: [PATCH] fix issue --- .../src/modules/bookings/bookings.controller.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/apps/edr-freight-api/src/modules/bookings/bookings.controller.ts b/apps/edr-freight-api/src/modules/bookings/bookings.controller.ts index 98bc2332e..7cc3d60d8 100644 --- a/apps/edr-freight-api/src/modules/bookings/bookings.controller.ts +++ b/apps/edr-freight-api/src/modules/bookings/bookings.controller.ts @@ -42,16 +42,13 @@ import type { Response } from "express"; import { BookingClearanceChargeService } from './booking-clearance-charge.service'; import { BookingPayablesService } from './booking-payables.service'; import { ClearanceEventService } from './clearance-event.service'; -<<<<<<< HEAD import { - BillClearanceChargeDto, + RejectClearanceChargeDto, } from './dto/clearance-charge.dto'; -======= import { BillClearanceChargeDto } from './dto/clearance-charge.dto'; import { AdditionalChargeService } from './additional-charge.service'; import { CancelAdditionalChargeDto, CreateAdditionalChargeDto } from './dto/additional-charge.dto'; ->>>>>>> 82c795999efce5e4422dd332551cecab2592764d import { BookingContractService } from './booking-contract.service'; import { BookingPricingService } from './booking-pricing.service'; import { BookingTransitionService } from './booking-transition.service';