From c09b258d57ecd02da3acc3a7940deba35858a756 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 26 May 2025 17:48:11 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/crm/doctype/contract/contract.json | 4 ---- erpnext/patches.txt | 4 ---- 2 files changed, 8 deletions(-) diff --git a/erpnext/crm/doctype/contract/contract.json b/erpnext/crm/doctype/contract/contract.json index 4c76adeb248..948243402fe 100755 --- a/erpnext/crm/doctype/contract/contract.json +++ b/erpnext/crm/doctype/contract/contract.json @@ -256,11 +256,7 @@ "grid_page_length": 50, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2020-12-07 11:15:58.385521", -======= "modified": "2025-05-23 13:54:03.346537", ->>>>>>> 016924361a (refactor: full name field in contract) "modified_by": "Administrator", "module": "CRM", "name": "Contract", diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 9dc1947cf2f..8bd4e847c22 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -405,8 +405,4 @@ erpnext.patches.v15_0.rename_group_by_to_categorize_by execute:frappe.db.set_single_value("Accounts Settings", "receivable_payable_fetch_method", "Buffered Cursor") erpnext.patches.v14_0.set_update_price_list_based_on erpnext.patches.v15_0.rename_group_by_to_categorize_by_in_custom_reports -<<<<<<< HEAD -======= -erpnext.patches.v15_0.remove_agriculture_roles erpnext.patches.v14_0.update_full_name_in_contract ->>>>>>> 8e2221178b (refactor: patch old contract with full party name)