From 378dc50aa49883dbcdbfcb67fcfd4741efad4e52 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 27 Nov 2023 09:09:04 +0530 Subject: [PATCH] chore: resolve conflict --- .../doctype/purchase_invoice_item/purchase_invoice_item.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json index 8fa6721720c..71796c9918d 100644 --- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json @@ -918,11 +918,7 @@ "idx": 1, "istable": 1, "links": [], -<<<<<<< HEAD "modified": "2023-11-14 18:33:48.547297", -======= - "modified": "2023-11-13 20:26:18.329983", ->>>>>>> 5fae2f6d57 (fix: allow on submit for child table fields) "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice Item",