commit 94d70bca9ed8bfbaf28d70569970bd19cf4e23fe
author Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Mon Nov 08 18:48:46 2021 +0530
committer GitHub <noreply@github.com> Mon Nov 08 18:48:46 2021 +0530
tree 220e4495445a8de972c31e8a011203b59d2af541
parent 45fd819729a73be9e334194e64ad00e81b36dabc

fix: Resolve conflicts

erpnext/patches.txt

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 0dcd3b7..1006e21 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -283,12 +283,8 @@
 erpnext.patches.v13_0.einvoicing_deprecation_warning
 execute:frappe.reload_doc("erpnext_integrations", "doctype", "TaxJar Settings")
 execute:frappe.reload_doc("erpnext_integrations", "doctype", "Product Tax Category")
-<<<<<<< HEAD
-erpnext.patches.v13_0.custom_fields_for_taxjar_integration
 erpnext.patches.v14_0.delete_einvoicing_doctypes
-=======
 erpnext.patches.v13_0.custom_fields_for_taxjar_integration          #08-11-2021
->>>>>>> 7f2d304f32 (fix: fixed company field, updated patch)
 erpnext.patches.v13_0.set_operation_time_based_on_operating_cost
 erpnext.patches.v13_0.validate_options_for_data_field
 erpnext.patches.v13_0.create_gst_payment_entry_fields