From 04da610288555454f3695fc0e2e06617bf41ad51 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Sat, 30 Mar 2024 20:05:21 +0530 Subject: [PATCH] chore: fix conflicts --- .../subcontracting_receipt_supplied_item.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json b/erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json index f4109ad6d1c..e1927a5467a 100644 --- a/erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json +++ b/erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -236,11 +236,7 @@ "idx": 1, "istable": 1, "links": [], -<<<<<<< HEAD - "modified": "2024-02-04 16:32:17.534162", -======= "modified": "2024-03-30 10:26:27.237371", ->>>>>>> d73b1f3e6a (fix: button to select serial / batch bundle in the subcontracting receipt) "modified_by": "Administrator", "module": "Subcontracting", "name": "Subcontracting Receipt Supplied Item", @@ -251,4 +247,4 @@ "sort_order": "DESC", "states": [], "track_changes": 1 -} \ No newline at end of file +}