From bc94358e98ca5dbffcf652de873fa25df657eb5b Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Thu, 30 Mar 2023 12:15:56 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/patches.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index c5a88e33187..82c8b06555b 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -326,10 +326,7 @@ erpnext.patches.v14_0.change_autoname_for_tax_withheld_vouchers erpnext.patches.v14_0.update_asset_value_for_manual_depr_entries erpnext.patches.v14_0.set_pick_list_status erpnext.patches.v13_0.update_docs_link -# below migration patches should always run last -erpnext.patches.v14_0.migrate_gl_to_payment_ledger -<<<<<<< HEAD -======= execute:frappe.delete_doc_if_exists("Report", "Tax Detail") erpnext.patches.v15_0.enable_all_leads ->>>>>>> ad11934d39 (fix: enabling lead even after "Opportunity" created against it (#34627)) +# below migration patches should always run last +erpnext.patches.v14_0.migrate_gl_to_payment_ledger