From 8e4ea7e99790a2fbe83a4462fe6020eead87c07f Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Sun, 26 Dec 2021 10:23:36 +0530
Subject: [PATCH] fix: Merge Conflicts

---
 erpnext/patches.txt | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 407d68384b..47be13087a 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -316,14 +316,7 @@ erpnext.patches.v13_0.create_ksa_vat_custom_fields
 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)
+