schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-04-22 11:48:07 +05:30
committed by GitHub
parent 198bdcfdc6
commit 712443a91c
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/regional/india/e_invoice/utils.py
View File

@@ -12,11 +12,8 @@ import traceback
import frappe import frappe
import jwt import jwt
<<<<<<< HEAD
import six import six
=======
import requests import requests
>>>>>>> ee8047aba3 (fix(india): 401 & 403 client error while generating IRN)
from frappe import _, bold from frappe import _, bold
from frappe.core.page.background_jobs.background_jobs import get_info from frappe.core.page.background_jobs.background_jobs import get_info
from frappe.integrations.utils import make_get_request, make_post_request from frappe.integrations.utils import make_get_request, make_post_request