From b35c5c1568ce3fdda0dd6e2484016a0e9980c116 Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Sat, 27 Jun 2026 16:34:53 +0530
Subject: [PATCH] chore: resolve conflicts

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

diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index 57e58b5d03f..5556ab927b4 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -130,6 +130,7 @@
    "fieldtype": "Data",
    "in_global_search": 1,
    "label": "Alias",
+   "no_copy": 1,
    "unique": 1
   },
   {
@@ -682,17 +683,6 @@
   {
    "fieldname": "credit_limit_column",
    "fieldtype": "Column Break"
-<<<<<<< HEAD
-=======
-  },
-  {
-   "fieldname": "alias",
-   "fieldtype": "Data",
-   "in_global_search": 1,
-   "label": "Alias",
-   "no_copy": 1,
-   "unique": 1
->>>>>>> 057af21cd8 (fix: party aliases should be no copy)
   }
  ],
  "icon": "fa fa-user",