From 81afdcf745a69c335710a0630173810bd517fc19 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 8 May 2024 17:57:43 +0530 Subject: [PATCH] fix: resolved conflict --- erpnext/patches.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 4a664a41298..91c77219510 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -360,10 +360,6 @@ erpnext.patches.v15_0.create_accounting_dimensions_in_payment_request 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 -<<<<<<< HEAD -erpnext.patches.v15_0.delete_orphaned_asset_movement_item_records -======= 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 ->>>>>>> e0d12ba4d0 (fix: Patch to fix the incorrect debit and credit in transaction currency)