From 987bd4fce2023dbaad31c84d9451109f4e81c389 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Mon, 8 Nov 2021 18:15:53 +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 f65374abc35..3f12fcdf2aa 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -331,9 +331,4 @@ erpnext.patches.v13_0.requeue_failed_reposts
 erpnext.patches.v13_0.fetch_thumbnail_in_website_items
 erpnext.patches.v12_0.update_production_plan_status
 erpnext.patches.v13_0.update_category_in_ltds_certificate
-<<<<<<< HEAD
-=======
-erpnext.patches.v13_0.create_pan_field_for_india #2
-erpnext.patches.v14_0.delete_hub_doctypes
 erpnext.patches.v13_0.create_ksa_vat_custom_fields
->>>>>>> 508832e90a (fix: Add patch to make custom fields)