From 712443a91c56d45f6ef8e7ef5bbf048ca6078295 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Fri, 22 Apr 2022 11:48:07 +0530
Subject: [PATCH] chore: Resolve conflicts

---
 erpnext/regional/india/e_invoice/utils.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/erpnext/regional/india/e_invoice/utils.py b/erpnext/regional/india/e_invoice/utils.py
index 16f63c621b1..fae88b63003 100644
--- a/erpnext/regional/india/e_invoice/utils.py
+++ b/erpnext/regional/india/e_invoice/utils.py
@@ -12,11 +12,8 @@ import traceback
 
 import frappe
 import jwt
-<<<<<<< HEAD
 import six
-=======
 import requests
->>>>>>> ee8047aba3 (fix(india): 401 & 403 client error while generating IRN)
 from frappe import _, bold
 from frappe.core.page.background_jobs.background_jobs import get_info
 from frappe.integrations.utils import make_get_request, make_post_request