commit 8e4ea7e99790a2fbe83a4462fe6020eead87c07f
author Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Sun Dec 26 10:23:36 2021 +0530
committer GitHub <noreply@github.com> Sun Dec 26 10:23:36 2021 +0530
tree 53f1d8e6017f7d618708b19559b80ddc163af46c
parent 98ac47caa4720ba87b593df0c97c84ec115327a3

fix: Merge Conflicts

erpnext/patches.txt

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 407d683..47be130 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -316,14 +316,7 @@
 erpnext.patches.v14_0.rename_ongoing_status_in_sla_documents
 erpnext.patches.v14_0.migrate_crm_settings
 erpnext.patches.v13_0.rename_ksa_qr_field
-<<<<<<< HEAD
 erpnext.patches.v13_0.disable_ksa_print_format_for_others # 16-12-2021
 erpnext.patches.v14_0.add_default_exit_questionnaire_notification_template
-=======
-erpnext.patches.v13_0.disable_ksa_print_format_for_others
-<<<<<<< HEAD
-erpnext.patches.v13_0.update_tax_category_for_rcm #1
->>>>>>> b33fd6acc7 (fix: Is Reverse Charge check in Tax Category)
-=======
 erpnext.patches.v13_0.update_tax_category_for_rcm
->>>>>>> 7c1bfe6b46 (chore: Remove patch comment)
+