chore: resolved conflict

erpnext/crm/doctype/lead/lead.json

@@ -510,61 +510,13 @@
    "fieldtype": "Tab Break",
    "label": "Connections",
    "show_dashboard": 1
-<<<<<<< HEAD
-=======
-  },
-  {
-   "fieldname": "column_break_gkxo",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "column_break_gqka",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "utm_content",
-   "fieldtype": "Data",
-   "label": "Content",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "utm_source",
-   "fieldtype": "Link",
-   "label": "Source",
-   "oldfieldname": "source",
-   "oldfieldtype": "Select",
-   "options": "UTM Source"
-  },
-  {
-   "fieldname": "utm_medium",
-   "fieldtype": "Link",
-   "label": "Medium",
-   "options": "UTM Medium"
-  },
-  {
-   "fieldname": "utm_campaign",
-   "fieldtype": "Link",
-   "label": "Campaign",
-   "oldfieldname": "campaign_name",
-   "oldfieldtype": "Link",
-   "options": "UTM Campaign"
-  },
-  {
-   "fieldname": "section_break_analytics",
-   "fieldtype": "Section Break",
-   "label": "Analytics"
->>>>>>> 018df3135a (fix: renamed Commments Tab to Notes tab in Lead doctype)
   }
  ],
  "icon": "fa fa-user",
  "idx": 5,
  "image_field": "image",
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-12-01 18:46:49.468526",
-=======
  "modified": "2025-01-31 13:40:08.094759",
->>>>>>> 018df3135a (fix: renamed Commments Tab to Notes tab in Lead doctype)
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Lead",
@@ -632,4 +584,4 @@
  "states": [],
  "subject_field": "title",
  "title_field": "title"
-}
+}