fix: resolved conflicts

2025-06-20 14:23:02 +05:30
parent c07d5b6dec
commit 881dcf817f
1 changed files with 0 additions and 3 deletions
--- 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
 }