From faf025454f6e843c9eeeb4e3514abc6c99167522 Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Mon, 27 Nov 2023 09:08:23 +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 279d511d77b..b62b4bab140 100644
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -893,11 +893,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",