From d12b54c50a3899c0c9c68c7ce3f030cb41dda6d7 Mon Sep 17 00:00:00 2001
From: ravibharathi656 <ravibharathi656@gmail.com>
Date: Fri, 27 Mar 2026 11:24:35 +0530
Subject: [PATCH] chore: resolve conflict

---
 erpnext/buying/doctype/purchase_order/purchase_order.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index a4e50467baa..260dc52ceac 100644
--- 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",