From b4a5bbc7e2e02f2c2bd2df476a12682992fb5955 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 2 Mar 2026 14:38:28 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/buying/doctype/purchase_order/purchase_order.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index 4746ebf700f..212a034763a 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -1327,11 +1327,7 @@ "idx": 105, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2026-02-23 14:22:33.323946", -======= "modified": "2026-03-02 00:40:47.119584", ->>>>>>> 9538a9870c (fix(accounts): add transaction time field) "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order",