From ff062d501f7860c3d64ae98691e87750a837bd68 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Tue, 5 Oct 2021 21:03:40 +0530
Subject: [PATCH] fix: Update patches.txt

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

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index ba7f6611d6c..2f4140ef403 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -313,12 +313,8 @@ 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
-<<<<<<< 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
->>>>>>> d49346ac45 (fix: Tax breakup based on items, missing GST fields (#27524))
 erpnext.patches.v13_0.create_accounting_dimensions_in_pos_doctypes
 erpnext.patches.v13_0.create_custom_field_for_finance_book
 erpnext.patches.v13_0.modify_invalid_gain_loss_gl_entries