chore: resolve conflict

2026-04-21 07:38:29 +00:00 · 2026-03-27 11:24:35 +05:30
parent f2195fa67d
commit d12b54c50a
1 changed files with 0 additions and 5 deletions
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -9,11 +9,6 @@
 "engine": "InnoDB",
 "field_order": [
  "supplier_section",
-<<<<<<< HEAD
-  "title",
-=======
-  "company",
->>>>>>> 5b1fa81451 (fix(accounts): set supplier name as title field in Purchase Invoice (#53710))
  "naming_series",
  "supplier",
  "supplier_name",