From b256c76c3b08a97089d72169579784c7c91baeac Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Wed, 15 Jul 2026 10:48:51 +0530
Subject: [PATCH] chore: resolve conflicts

---
 .../doctype/purchase_order_item/purchase_order_item.json      | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
index 6d0949a2429..ebe58d1a484 100644
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -953,11 +953,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2026-05-14 12:16:16.192936",
-=======
  "modified": "2026-07-15 10:30:04.600510",
->>>>>>> f44bcae47d (fix: hide job card field in purchase order item)
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Purchase Order Item",