From 24678b0e24b256c5d733fa745302087afca3af84 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 12 Mar 2025 10:38:26 +0530 Subject: [PATCH] chore: conflicts --- erpnext/patches.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index fb2dca2f384..5e657df44dc 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -396,14 +396,8 @@ erpnext.patches.v14_0.disable_add_row_in_gross_profit erpnext.patches.v15_0.set_difference_amount_in_asset_value_adjustment erpnext.patches.v14_0.update_posting_datetime erpnext.stock.doctype.stock_ledger_entry.patches.ensure_sle_indexes -erpnext.patches.v15_0.rename_sla_fields erpnext.patches.v15_0.update_query_report erpnext.patches.v15_0.rename_field_from_rate_difference_to_amount_difference erpnext.patches.v15_0.recalculate_amount_difference_field -<<<<<<< HEAD -======= erpnext.patches.v15_0.rename_sla_fields #2025-03-12 -erpnext.stock.doctype.stock_ledger_entry.patches.ensure_sle_indexes -erpnext.patches.v15_0.update_query_report ->>>>>>> 8bce42e633 (fix: rename sla fields patch (#46465)) erpnext.patches.v15_0.set_purchase_receipt_row_item_to_capitalization_stock_item