From d2c6a8958d6628ef17c1b68c3204dace1e35600b Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 8 Apr 2026 12:28:29 +0530 Subject: [PATCH] chore: fix conflicts Updated the modified date for the delivery note item. --- .../doctype/delivery_note_item/delivery_note_item.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json index a6696cac254..3a82642873d 100644 --- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json +++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -951,11 +951,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], -<<<<<<< HEAD - "modified": "2025-05-31 18:51:32.651562", -======= - "modified": "2026-04-07 15:43:20.892151", ->>>>>>> 90fd6f2e40 (fix: hardcoded precision causing decimal issues) + "modified": "2026-04-07 15:44:20.892151", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note Item",