From 841f5c24ad9b8592b2074cfe32b313c77ca5d51d Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Tue, 25 Nov 2025 10:51:39 +0530
Subject: [PATCH] chore: resolve conflicts

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

diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index dff5984feec..7c0676c672f 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -610,11 +610,7 @@
    "link_fieldname": "party"
   }
  ],
-<<<<<<< HEAD
- "modified": "2025-03-05 10:01:47.885574",
-=======
  "modified": "2025-11-25 09:35:56.772949",
->>>>>>> c2b8b97d7d (fix: incorrect query filter when selecting primary customer adr (#50727))
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Customer",
@@ -700,4 +696,4 @@
  "states": [],
  "title_field": "customer_name",
  "track_changes": 1
-}
\ No newline at end of file
+}