From cef69b05a9c54bc5c90bab7c76aa96ca88bb90e8 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Thu, 9 Jul 2026 20:44:57 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/stock/doctype/item/item.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index fbaa17a76df..e8280bacf4a 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -898,11 +898,7 @@ "image_field": "image", "links": [], "make_attachments_public": 1, -<<<<<<< HEAD - "modified": "2026-03-17 20:39:05.218344", -======= "modified": "2026-07-05 23:24:45.734144", ->>>>>>> 54da9fc27a (fix: update modified timestamp in item.json) "modified_by": "Administrator", "module": "Stock", "name": "Item",