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

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

diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index a09e5041fd6..841a3ac780d 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -110,6 +110,7 @@
    "fieldtype": "Data",
    "in_global_search": 1,
    "label": "Alias",
+   "no_copy": 1,
    "unique": 1
   },
   {
@@ -548,17 +549,6 @@
   {
    "fieldname": "section_break_pgad",
    "fieldtype": "Section 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)
   }
  ],
  "grid_page_length": 50,