chore: resolve conflicts

2026-02-12 17:23:38 +00:00 · 2026-02-07 21:44:42 +05:30
parent 23a26b540b
commit dd45bb5664
1 changed files with 0 additions and 4 deletions
--- 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",