fix: resolve merge conflict in patches.txt

resilient-tech · Sep 17, 2024 · 4aed936 · 4aed936
1 parent 9d2e7f7
commit 4aed936
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/india_compliance/patches.txt b/india_compliance/patches.txt
@@ -3,15 +3,9 @@ execute:import frappe; frappe.delete_doc_if_exists("DocType", "GSTIN")
 
 [post_model_sync]
 india_compliance.patches.v14.set_default_for_overridden_accounts_setting
-<<<<<<< HEAD
-execute:from india_compliance.gst_india.setup import create_custom_fields; create_custom_fields() #51
+execute:from india_compliance.gst_india.setup import create_custom_fields; create_custom_fields() #58
 execute:from india_compliance.gst_india.setup import create_property_setters; create_property_setters() #7
 execute:from india_compliance.income_tax_india.setup import create_custom_fields; create_custom_fields() #1
-=======
-execute:from india_compliance.gst_india.setup import create_custom_fields; create_custom_fields() #58
-execute:from india_compliance.gst_india.setup import create_property_setters; create_property_setters() #8
-execute:from india_compliance.income_tax_india.setup import create_custom_fields; create_custom_fields() #2
->>>>>>> 4511437b (fix: manually mark e-Invoice as generated)
 india_compliance.patches.post_install.remove_old_fields #2
 india_compliance.patches.post_install.set_gst_tax_type
 india_compliance.patches.post_install.set_gst_tax_type_in_journal_entry