From f4cda10ca819438853ef67e195cf53165446adfe Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 6 Jan 2026 21:00:18 +0530 Subject: [PATCH] chore: fix conflicts --- .../doctype/material_request_item/material_request_item.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/material_request_item/material_request_item.json b/erpnext/stock/doctype/material_request_item/material_request_item.json index e050be51fda..59618ca0c8f 100644 --- a/erpnext/stock/doctype/material_request_item/material_request_item.json +++ b/erpnext/stock/doctype/material_request_item/material_request_item.json @@ -502,7 +502,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2024-02-26 18:30:03.684872", + "modified": "2026-01-06 18:30:03.684872", "modified_by": "Administrator", "module": "Stock", "name": "Material Request Item",