From 70f35270ad4a82cc42a832e7d6d1c15f298ccaed Mon Sep 17 00:00:00 2001
From: JuruSysadmin <joelson@jurunense.com.br>
Date: Tue, 13 Jan 2026 12:57:22 -0300
Subject: [PATCH] fix: resolve merge conflict in calculateDeliveryTaxOrder

---
 src/sales/sales/sales.service.ts | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/sales/sales/sales.service.ts b/src/sales/sales/sales.service.ts
index 1859bbd..f1c18d2 100644
--- a/src/sales/sales/sales.service.ts
+++ b/src/sales/sales/sales.service.ts
@@ -1505,17 +1505,7 @@ export class SalesService {
     }
 
     async calculateDeliveryTaxOrder(dataDeliveryTax: any) {
-<<<<<<< HEAD
-        let cityId = await this.customerService.findCity(dataDeliveryTax.ibgeCode);
-        
-=======
         console.log("json dataDeliveryTax", dataDeliveryTax);
-        /*const dataDeliveryTax = {
-              cartId: cartId,
-              cityId: cityId,
-              ibgeCode: ibgeCode,
-              priorityDelivery: priorityDelivery,
-            };*/
 
         let cityId = 0;
         if (dataDeliveryTax.ibgeCode) {
@@ -1523,7 +1513,6 @@ export class SalesService {
         } else {
             cityId = dataDeliveryTax.cityId;
         }
->>>>>>> feat/painel-cliente
         await this.updatePriorityDelivery(dataDeliveryTax.cartId, dataDeliveryTax.priorityDelivery);
 
         if (cityId == 0) {