From fe8c9a360556c86b505ef18d32facaff6af637af Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Wed, 5 Mar 2025 14:54:40 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/patches.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 18feaa19ee5..8509989a2ca 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -261,14 +261,7 @@ erpnext.patches.v14_0.show_loan_management_deprecation_warning erpnext.patches.v14_0.clear_reconciliation_values_from_singles execute:frappe.rename_doc("Report", "TDS Payable Monthly", "Tax Withholding Details", force=True) erpnext.patches.v14_0.update_proprietorship_to_individual -<<<<<<< HEAD -<<<<<<< HEAD erpnext.patches.v15_0.rename_subcontracting_fields -======= -erpnext.stock.doctype.purchase_receipt_item.patches.rename_field_from_rate_difference_to_amount_difference ->>>>>>> 17d415b105 (fix: set landed cost based on purchase invoice rate) -======= ->>>>>>> 154e9813c4 (fix: revert last commit) [post_model_sync] erpnext.patches.v15_0.create_asset_depreciation_schedules_from_assets