From ab37e5754b286bf7ffb19b25f548abbfcc930dfd Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 5 Feb 2025 16:40:20 +0530 Subject: [PATCH] chore: fix conflicts --- .../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 f1be802fe24..ff64db8ee76 100644 --- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json +++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -934,11 +934,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], -<<<<<<< HEAD - "modified": "2024-11-21 17:37:37.441498", -======= - "modified": "2025-02-05 14:27:32.322181", ->>>>>>> 417bf49a8d (fix: added correct options for incoming_rate field of delivery note item) + "modified": "2025-02-05 14:28:32.322181", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note Item",