From d8c1bc26c4ce89de0e63c9115d74edd9cae6bace Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Wed, 25 Jun 2025 17:24:27 +0200
Subject: [PATCH] chore: resolve conflicts

---
 erpnext/selling/doctype/customer/customer.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index ad826079771..9e98fcec73b 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -390,14 +390,9 @@ def create_contact(contact, party_type, party, email):
 	doc = frappe.get_doc(
 		{
 			"doctype": "Contact",
-<<<<<<< HEAD
 			"first_name": first,
 			"middle_name": middle,
 			"last_name": last,
-=======
-			"first_name": contact[0],
-			"last_name": len(contact) > 1 and contact[1] or "",
->>>>>>> a74e1f1600 (fix(crm): ensure primary address and contact follows customer setting (#37710))
 			"is_primary_contact": 1,
 		}
 	)