From 33fa14b6cf8acb929ab6e37dd240d866b6b899c8 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Sun, 27 Mar 2022 19:23:53 +0530
Subject: [PATCH] fix: Resolve conflicts

---
 erpnext/public/js/controllers/taxes_and_totals.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index c861ebb19df..6dc3cd7d0a1 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -34,11 +34,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
 		frappe.model.set_value(item.doctype, item.name, "rate", item_rate);
 	}
 
-<<<<<<< HEAD
-	calculate_taxes_and_totals(update_paid_amount) {
-=======
-	calculate_taxes_and_totals: async function(update_paid_amount) {
->>>>>>> a044e92687 (fix: Incorrect default amount to pay for POS invoices)
+	async calculate_taxes_and_totals(update_paid_amount) {
 		this.discount_amount_applied = false;
 		this._calculate_taxes_and_totals();
 		this.calculate_discount_amount();