From 0ae0ebc3784b962252c63c51107653fea34669c9 Mon Sep 17 00:00:00 2001
From: ravibharathi656 <ravibharathi656@gmail.com>
Date: Wed, 4 Feb 2026 13:08:29 +0530
Subject: [PATCH] chore: fix conflicts

---
 erpnext/regional/italy/utils.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/erpnext/regional/italy/utils.py b/erpnext/regional/italy/utils.py
index 481714ea04e..d996ff9b2ac 100644
--- a/erpnext/regional/italy/utils.py
+++ b/erpnext/regional/italy/utils.py
@@ -141,17 +141,6 @@ def download_zip(files, output_filename):
 
 def get_invoice_summary(items, taxes):
 	summary_data = frappe._dict()
-<<<<<<< HEAD
-=======
-	taxes_wise_tax_details = {}
-
-	for d in item_wise_tax_details:
-		if d.tax_row not in taxes_wise_tax_details:
-			taxes_wise_tax_details[d.tax_row] = []
-
-		taxes_wise_tax_details[d.tax_row].append(d)
-
->>>>>>> 57bd1facf5 (fix: group item wise tax details by tax row)
 	for tax in taxes:
 		# Include only VAT charges.
 		if tax.charge_type == "Actual":