From 243022e1667232ab343e842071d9fc6e5024f9e5 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Mon, 29 Nov 2021 11:33:52 +0530
Subject: [PATCH] fix: Conflicts

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

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 93e6de4a74d..5634dfc1f9a 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -311,15 +311,11 @@ execute:frappe.reload_doc("erpnext_integrations", "doctype", "Product Tax Catego
 erpnext.patches.v13_0.custom_fields_for_taxjar_integration          #08-11-2021
 erpnext.patches.v13_0.set_operation_time_based_on_operating_cost
 erpnext.patches.v13_0.validate_options_for_data_field
-<<<<<<< HEAD
 erpnext.patches.v13_0.create_website_items #30-09-2021
 erpnext.patches.v13_0.populate_e_commerce_settings
 erpnext.patches.v13_0.make_homepage_products_website_items
 erpnext.patches.v13_0.update_dates_in_tax_withholding_category
-=======
 erpnext.patches.v13_0.create_gst_payment_entry_fields #27-11-2021
-erpnext.patches.v14_0.delete_shopify_doctypes
->>>>>>> 43038aab79 (fix: do not add gst fields if no indian company)
 erpnext.patches.v13_0.fix_invoice_statuses
 erpnext.patches.v13_0.replace_supplier_item_group_with_party_specific_item
 erpnext.patches.v13_0.gst_fields_for_pos_invoice