diff options
Diffstat (limited to 'src/lib/checkout')
| -rw-r--r-- | src/lib/checkout/components/Checkout.jsx | 3 |
1 files changed, 0 insertions, 3 deletions
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> )} |