From e9be8583b0f374e5c2b5b655377c4397bb130288 Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Wed, 8 Jan 2025 11:08:27 +0530
Subject: [PATCH] fix: resolved conflicts

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

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 4f50a3a6c07..d553fd12bb5 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -386,8 +386,5 @@ erpnext.patches.v14_0.update_stock_uom_in_work_order_item
 erpnext.patches.v15_0.set_is_exchange_gain_loss_in_payment_entry_deductions
 erpnext.patches.v15_0.enable_allow_existing_serial_no
 erpnext.patches.v15_0.update_cc_in_process_statement_of_accounts
-<<<<<<< HEAD
-=======
 erpnext.patches.v15_0.refactor_closing_stock_balance #5
 erpnext.patches.v15_0.update_asset_status_to_work_in_progress
->>>>>>> 6850019649 (feat: work in progress status for asset (#45066))