From bcd3b368211e8acd1fd1a402801f0e32f9cda34c Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 31 Dec 2024 15:55:03 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/controllers/taxes_and_totals.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py index ef2c2077c80..95a6f773403 100644 --- a/erpnext/controllers/taxes_and_totals.py +++ b/erpnext/controllers/taxes_and_totals.py @@ -18,12 +18,7 @@ from erpnext.controllers.accounts_controller import ( validate_inclusive_tax, validate_taxes_and_charges, ) -<<<<<<< HEAD -from erpnext.stock.get_item_details import _get_item_tax_template -======= -from erpnext.deprecation_dumpster import deprecated -from erpnext.stock.get_item_details import ItemDetailsCtx, _get_item_tax_template, get_item_tax_map ->>>>>>> de54c0b41f (fix: update item_tax_rate in backend) +from erpnext.stock.get_item_details import _get_item_tax_template, get_item_tax_map from erpnext.utilities.regional import temporary_flag