From 4019148a424ca10e235024e3efd0e944facd8b36 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Thu, 28 Oct 2021 20:26:38 +0530
Subject: [PATCH] fix: Resolve conflicts

---
 erpnext/patches.txt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index fad36c7a83b..2ad2fea6847 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -328,11 +328,6 @@ erpnext.patches.v13_0.add_default_interview_notification_templates
 erpnext.patches.v13_0.trim_sales_invoice_custom_field_length
 erpnext.patches.v13_0.enable_scheduler_job_for_item_reposting
 erpnext.patches.v13_0.requeue_failed_reposts
-<<<<<<< HEAD
 erpnext.patches.v13_0.fetch_thumbnail_in_website_items
 erpnext.patches.v12_0.update_production_plan_status
-=======
-erpnext.patches.v13_0.healthcare_deprecation_warning
-erpnext.patches.v14_0.delete_healthcare_doctypes
 erpnext.patches.v13_0.update_category_in_ltds_certificate
->>>>>>> bf13d183d8 (fix: Replace section code with tax withholding category in LDC)