From 66a48236402bb87d2b4c3a7fe60bd1776c0c30cd Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Sat, 7 Feb 2026 21:45:35 +0530
Subject: [PATCH] chore: resolve conflicts

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

diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index 5516f7740f5..ee3c9c840f0 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -486,11 +486,7 @@
    "link_fieldname": "party"
   }
  ],
-<<<<<<< HEAD
- "modified": "2024-05-08 18:02:57.342931",
-=======
  "modified": "2026-02-06 12:58:01.398824",
->>>>>>> cfdc554a19 (fix(buying): add supplier group link filters in field level)
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Supplier",
@@ -556,4 +552,4 @@
  "states": [],
  "title_field": "supplier_name",
  "track_changes": 1
-}
\ No newline at end of file
+}