chore: resolve conflict

frappe · Dec 31, 2024 · bcd3b36 · bcd3b36
1 parent cf980a1
commit bcd3b36
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
@@ -18,12 +18,7 @@
 	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