chore: resolve conflict

erpnext/crm/doctype/market_segment/market_segment.json

@@ -1,20 +1,4 @@
 {
-<<<<<<< HEAD
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "field:market_segment", 
- "beta": 0, 
- "creation": "2018-10-01 09:59:14.479509", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
-=======
  "actions": [],
  "allow_rename": 1,
  "autoname": "field:market_segment",
@@ -25,59 +9,13 @@
  "field_order": [
   "market_segment"
  ],
->>>>>>> f3142c4af6 (fix: allow rename for market segment doctype)
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "market_segment", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Market Segment", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "fieldname": "market_segment",
+   "fieldtype": "Data",
+   "label": "Market Segment",
    "unique": 1
   }
-<<<<<<< HEAD
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-10-01 09:59:14.479509", 
- "modified_by": "Administrator", 
- "module": "CRM", 
- "name": "Market Segment", 
- "name_case": "", 
- "owner": "Administrator", 
-=======
  ],
  "links": [],
  "modified": "2025-12-17 12:09:34.687368",
@@ -86,40 +24,19 @@
  "name": "Market Segment",
  "naming_rule": "By fieldname",
  "owner": "Administrator",
->>>>>>> f3142c4af6 (fix: allow rename for market segment doctype)
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Manager",
+   "share": 1,
    "write": 1
   }
-<<<<<<< HEAD
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0, 
- "track_views": 0
-}
-=======
  ],
  "quick_entry": 1,
  "row_format": "Dynamic",
@@ -129,4 +46,3 @@
  "track_changes": 1,
  "translated_doctype": 1
 }
->>>>>>> f3142c4af6 (fix: allow rename for market segment doctype)