From 1d5345abc16b228d89a2c8c8c264a10e7c969d6f Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Tue, 22 Oct 2024 01:23:49 +0530
Subject: [PATCH] chore: resolved conflicts

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

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 32e56be77ea..3013c3c9750 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -377,9 +377,6 @@ erpnext.patches.v15_0.drop_index_posting_datetime_from_sle
 erpnext.patches.v15_0.add_disassembly_order_stock_entry_type #1
 erpnext.patches.v15_0.set_standard_stock_entry_type
 erpnext.patches.v15_0.link_purchase_item_to_asset_doc
-<<<<<<< HEAD
 erpnext.patches.v14_0.update_currency_exchange_settings_for_frankfurter
-=======
 erpnext.patches.v15_0.migrate_to_utm_analytics
 erpnext.patches.v15_0.update_task_assignee_email_field_in_asset_maintenance_log
->>>>>>> 5911934dc7 (feat: added assignee email field in asset maintenance log)