From 2c52f2ce13b90a4eb14b1571d0bd70f4899765c2 Mon Sep 17 00:00:00 2001
From: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Date: Thu, 14 Dec 2023 13:51:47 +0100
Subject: [PATCH] chore: resolve conflicts

---
 erpnext/crm/doctype/lead/lead.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index 7747e263a69..b7292a77f7d 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -514,11 +514,7 @@
  "idx": 5,
  "image_field": "image",
  "links": [],
-<<<<<<< HEAD
- "modified": "2022-10-13 12:42:04.277879",
-=======
  "modified": "2023-12-01 18:46:49.468526",
->>>>>>> ceeb724acc (feat: set lead name from email)
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Lead",
@@ -587,4 +583,4 @@
  "states": [],
  "subject_field": "title",
  "title_field": "title"
-}
\ No newline at end of file
+}