From 996f7d30b9bd564725a22d465c66dc3a361f7bc0 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 22 Mar 2024 21:08:11 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/patches.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 4242e1bdae4..9fffbae4c8b 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -353,12 +353,8 @@ erpnext.patches.v14_0.update_zero_asset_quantity_field execute:frappe.db.set_single_value("Buying Settings", "project_update_frequency", "Each Transaction") erpnext.patches.v14_0.update_total_asset_cost_field erpnext.patches.v14_0.create_accounting_dimensions_in_reconciliation_tool -<<<<<<< HEAD erpnext.patches.v15_0.allow_on_submit_dimensions_for_repostable_doctypes -erpnext.patches.v14_0.update_flag_for_return_invoices -======= erpnext.patches.v14_0.update_flag_for_return_invoices #2024-03-22 ->>>>>>> a88bf8419e (refactor: reset flag for old records) # below migration patch should always run last erpnext.patches.v14_0.migrate_gl_to_payment_ledger erpnext.stock.doctype.delivery_note.patches.drop_unused_return_against_index # 2023-12-20