From f29c43811c6dc3c61698d78a9a3cb1476b98cf0a Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Wed, 5 Mar 2025 12:55:10 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/patches.txt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 2f7fbac904d..6a41b007308 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -392,15 +392,7 @@ erpnext.patches.v15_0.migrate_checkbox_to_select_for_reconciliation_effect erpnext.patches.v15_0.sync_auto_reconcile_config execute:frappe.db.set_single_value("Accounts Settings", "exchange_gain_loss_posting_date", "Payment") erpnext.patches.v14_0.disable_add_row_in_gross_profit -<<<<<<< HEAD erpnext.patches.v15_0.set_difference_amount_in_asset_value_adjustment erpnext.patches.v14_0.update_posting_datetime -<<<<<<< HEAD erpnext.stock.doctype.stock_ledger_entry.patches.ensure_sle_indexes -======= -erpnext.patches.v14_0.update_posting_datetime -erpnext.support.doctype.service_level_agreement.patches.rename_sla_fields ->>>>>>> baa0dd1235 (fix: rename some sla fields) -======= erpnext.patches.v15_0.rename_sla_fields ->>>>>>> dcec446e55 (fix: patch path)