From 274ce1032913dc56b4844f0f1eb8443664a4db3c Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Mon, 26 May 2025 17:46:10 +0530
Subject: [PATCH] chore: resolve conflicts

---
 erpnext/crm/doctype/contract/contract.json |  4 ---
 erpnext/crm/doctype/contract/contract.py   | 40 ----------------------
 erpnext/patches.txt                        |  8 -----
 3 files changed, 52 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/crm/doctype/contract/contract.py b/erpnext/crm/doctype/contract/contract.py
index eb1dcbfa957..f30d576213f 100644
--- a/erpnext/crm/doctype/contract/contract.py
+++ b/erpnext/crm/doctype/contract/contract.py
@@ -9,46 +9,6 @@ from frappe.utils import getdate, nowdate
 
 
 class Contract(Document):
-<<<<<<< HEAD
-=======
-	# begin: auto-generated types
-	# This code is auto-generated. Do not modify anything in this block.
-
-	from typing import TYPE_CHECKING
-
-	if TYPE_CHECKING:
-		from frappe.types import DF
-
-		from erpnext.crm.doctype.contract_fulfilment_checklist.contract_fulfilment_checklist import (
-			ContractFulfilmentChecklist,
-		)
-
-		amended_from: DF.Link | None
-		contract_template: DF.Link | None
-		contract_terms: DF.TextEditor
-		document_name: DF.DynamicLink | None
-		document_type: DF.Literal[
-			"", "Quotation", "Project", "Sales Order", "Purchase Order", "Sales Invoice", "Purchase Invoice"
-		]
-		end_date: DF.Date | None
-		fulfilment_deadline: DF.Date | None
-		fulfilment_status: DF.Literal["N/A", "Unfulfilled", "Partially Fulfilled", "Fulfilled", "Lapsed"]
-		fulfilment_terms: DF.Table[ContractFulfilmentChecklist]
-		ip_address: DF.Data | None
-		is_signed: DF.Check
-		party_full_name: DF.Data | None
-		party_name: DF.DynamicLink
-		party_type: DF.Literal["Customer", "Supplier", "Employee"]
-		party_user: DF.Link | None
-		requires_fulfilment: DF.Check
-		signed_by_company: DF.Link | None
-		signed_on: DF.Datetime | None
-		signee: DF.Data | None
-		start_date: DF.Date | None
-		status: DF.Literal["Unsigned", "Active", "Inactive"]
-	# end: auto-generated types
-
->>>>>>> 016924361a (refactor: full name field in contract)
 	def autoname(self):
 		name = self.party_name
 
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index f6ee99c86c3..1d051fd2489 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -375,13 +375,5 @@ erpnext.stock.doctype.stock_ledger_entry.patches.ensure_sle_indexes
 erpnext.patches.v14_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
-<<<<<<< HEAD
 erpnext.patches.v14_0.rename_group_by_to_categorize_by_in_custom_reports
-=======
-erpnext.patches.v15_0.update_journal_entry_type
-erpnext.patches.v15_0.set_grand_total_to_default_mop
-execute:frappe.db.set_single_value("Accounts Settings", "use_new_budget_controller", True)
-erpnext.patches.v15_0.rename_group_by_to_categorize_by_in_custom_reports
-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)