From 8c01ae952be19070110b7327a714e6670cbf0a66 Mon Sep 17 00:00:00 2001
From: Subin Tom <36098155+nemesis189@users.noreply.github.com>
Date: Fri, 17 Sep 2021 20:18:39 +0530
Subject: [PATCH] conflict fixes

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

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index b30bd75a058..66c4d5516a5 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -313,10 +313,5 @@ erpnext.patches.v13_0.create_website_items
 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
-<<<<<<< HEAD
 erpnext.patches.v13_0.replace_supplier_item_group_with_party_specific_item
-=======
-erpnext.patches.v14_0.update_opportunity_currency_fields
 erpnext.patches.v13_0.gst_fields_for_pos_invoice
-erpnext.patches.v13_0.create_accounting_dimensions_in_pos_doctypes
->>>>>>> d49346ac45 (fix: Tax breakup based on items, missing GST fields (#27524))