From 6eb3d6a814a1a86a6d606946779278488c0a8b68 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Sat, 25 Dec 2021 09:04:34 +0530
Subject: [PATCH] fix: Conflicts

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

diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 794e912eda..3791741663 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -1622,13 +1622,8 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 		me.frm.refresh_field('items');
 		me.apply_rule_on_other_items(items_rule_dict);
 
-<<<<<<< HEAD
-		if(!price_list_rate_changed) me.calculate_taxes_and_totals();
-	}
-=======
 		me.calculate_taxes_and_totals();
-	},
->>>>>>> 233f79bf96 (fix: Recalculate taxes irrespective of price list rate changed or not)
+	}
 
 	apply_rule_on_other_items(args) {
 		const me = this;