fix: resolved conflict

frappe · May 8, 2024 · 5039f45 · 5039f45
1 parent 81afdcf
commit 5039f45
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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