From 7477bb96c831b78ddf566f75a11d26155186b109 Mon Sep 17 00:00:00 2001
From: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Date: Mon, 28 Nov 2022 18:51:40 +0100
Subject: [PATCH] chore: resolve merge conflict

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

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 6bcfeae14ec..8bc52305b68 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -316,11 +316,6 @@ erpnext.patches.v14_0.create_accounting_dimensions_in_subcontracting_doctypes
 erpnext.patches.v14_0.fix_subcontracting_receipt_gl_entries
 erpnext.patches.v14_0.migrate_remarks_from_gl_to_payment_ledger
 erpnext.patches.v14_0.create_accounting_dimensions_for_asset_capitalization
-<<<<<<< HEAD
 erpnext.patches.v13_0.update_schedule_type_in_loans
 erpnext.patches.v14_0.update_partial_tds_fields
-
-=======
-erpnext.patches.v14_0.update_tds_fields
 erpnext.patches.v14_0.create_incoterms_and_migrate_shipment
->>>>>>> d2563ee973 (feat: create incoterms and migrate shipments)