From d1049b0d008f7ca838d4d620b8078ff3409d8303 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Wed, 23 Feb 2022 11:10:07 +0530
Subject: [PATCH] fix: Resolve conflicts

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

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index f7bc17cb3a8..d53df7e4f63 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -349,10 +349,6 @@ erpnext.patches.v13_0.update_sane_transfer_against
 erpnext.patches.v13_0.enable_provisional_accounting
 erpnext.patches.v13_0.update_disbursement_account
 erpnext.patches.v13_0.update_reserved_qty_closed_wo
-<<<<<<< HEAD
 erpnext.patches.v13_0.amazon_mws_deprecation_warning
 erpnext.patches.v13_0.set_work_order_qty_in_so_from_mr
-=======
-erpnext.patches.v14_0.delete_amazon_mws_doctype
 erpnext.patches.v13_0.update_accounts_in_loan_docs
->>>>>>> a0bdcbd0cd (fix: Add patch for account fields)