From 5039f45be461f0467f6c50a0b770fc35d24896ae Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 8 May 2024 18:23:30 +0530 Subject: [PATCH] fix: resolved conflict --- erpnext/patches.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 91c77219510..5b3462231d3 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -361,5 +361,4 @@ erpnext.patches.v14_0.migrate_gl_to_payment_ledger erpnext.stock.doctype.delivery_note.patches.drop_unused_return_against_index # 2023-12-20 erpnext.patches.v14_0.set_maintain_stock_for_bom_item erpnext.patches.v15_0.delete_orphaned_asset_movement_item_records -erpnext.patches.v15_0.remove_cancelled_asset_capitalization_from_asset erpnext.patches.v15_0.fix_debit_credit_in_transaction_currency