From 881dcf817f7528dacf5c9649bf24c5dd9df9ca9a Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Fri, 20 Jun 2025 14:23:02 +0530
Subject: [PATCH] fix: resolved conflicts

---
 erpnext/crm/doctype/contract/contract.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/erpnext/crm/doctype/contract/contract.json b/erpnext/crm/doctype/contract/contract.json
index 5938701031e..7fa7002b82d 100755
--- a/erpnext/crm/doctype/contract/contract.json
+++ b/erpnext/crm/doctype/contract/contract.json
@@ -330,11 +330,8 @@
  "show_name_in_global_search": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
-<<<<<<< HEAD
-=======
  "states": [],
  "title_field": "party_name",
->>>>>>> bf56c73c6c (feat: add naming series for Contract Doctype)
  "track_changes": 1,
  "track_seen": 1
 }