From 44895db5a27a87e6f6f91d4d3fda33ff444f82f0 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 11 Jul 2024 15:21:10 +0700
Subject: <iman> marge conflik

---
 src/lib/checkout/components/Checkout.jsx | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/lib/checkout/components')

diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx
index 4355c7bd..3c2b8a09 100644
--- a/src/lib/checkout/components/Checkout.jsx
+++ b/src/lib/checkout/components/Checkout.jsx
@@ -1391,13 +1391,10 @@ const Checkout = () => {
                   <div className='flex gap-x-2 justify-between mb-4'>
                     <div>Grand Total</div>
                     <div className='font-semibold text-gray_r-12'>
-<<<<<<< HEAD
                       {currencyFormat(grandTotal)}
-=======
                       {currencyFormat(
                         cartCheckout?.grandTotal + finalShippingAmt
                       )}
->>>>>>> dev/voucher-shipment
                     </div>
                   </div>
                 )}
-- 
cgit v1.2.3