fix: resolved conflicts

frappe · Jan 8, 2025 · e9be858 · e9be858
1 parent 7318748
commit e9be858
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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))