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

---
 erpnext/buying/doctype/supplier/supplier.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index 24b37c20ff5..78b797d4c2b 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -501,11 +501,7 @@
    "link_fieldname": "party"
   }
  ],
-<<<<<<< HEAD
- "modified": "2026-01-16 15:56:31.139206",
-=======
  "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",