fix: Resolve conflicts
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index c861ebb..6dc3cd7 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -34,11 +34,7 @@
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();