fix: resolved conflict

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