From 8f0cf1b7dc762bf73cb19fa73d90405f5be7c761 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 7 Nov 2023 15:56:35 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/patches.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index bad878e3c54..86984819816 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -346,14 +346,8 @@ erpnext.patches.v14_0.rename_over_order_allowance_field erpnext.patches.v14_0.migrate_delivery_stop_lock_field execute:frappe.db.set_single_value("Payment Reconciliation", "invoice_limit", 50) execute:frappe.db.set_single_value("Payment Reconciliation", "payment_limit", 50) -<<<<<<< HEAD erpnext.patches.v14_0.rename_daily_depreciation_to_depreciation_amount_based_on_num_days_in_month erpnext.patches.v14_0.rename_depreciation_amount_based_on_num_days_in_month_to_daily_prorata_based -======= erpnext.patches.v14_0.add_default_for_repost_settings -erpnext.patches.v15_0.rename_daily_depreciation_to_depreciation_amount_based_on_num_days_in_month -erpnext.patches.v15_0.rename_depreciation_amount_based_on_num_days_in_month_to_daily_prorata_based -erpnext.patches.v15_0.set_reserved_stock_in_bin ->>>>>>> ebb186c8df (chore: patch to update default repost settings value) # below migration patch should always run last erpnext.patches.v14_0.migrate_gl_to_payment_ledger