From cdb884bbf2ca4d2c1d22fcd7ca85023e3fc0bd37 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Tue, 31 May 2022 12:21:29 +0530
Subject: [PATCH] fix: conflicts

---
 erpnext/regional/india/utils.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/regional/india/utils.py b/erpnext/regional/india/utils.py
index fb959081f83..88c899734ed 100644
--- a/erpnext/regional/india/utils.py
+++ b/erpnext/regional/india/utils.py
@@ -5,10 +5,6 @@ import re
 import frappe
 from frappe import _
 from frappe.model.utils import get_fetch_values
-<<<<<<< HEAD
-from frappe.utils import cint, cstr, date_diff, flt, getdate, nowdate
-from six import string_types
-=======
 from frappe.utils import (
 	add_days,
 	cint,
@@ -19,7 +15,7 @@ from frappe.utils import (
 	getdate,
 	month_diff,
 )
->>>>>>> 34925a3a8c (fix: HRA Exemption calculation in case of multiple salary structure assignments)
+from six import string_types
 
 from erpnext.controllers.accounts_controller import get_taxes_and_charges
 from erpnext.controllers.taxes_and_totals import get_itemised_tax, get_itemised_taxable_amount