fix: resolved conflict

This commit is contained in:
Nabin Hait
2024-05-08 18:23:30 +05:30
committed by GitHub
parent 81afdcf745
commit 5039f45be4

View File

@@ -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