From c68afbc7156d860f8b7001dab742ab3d6ae1a860 Mon Sep 17 00:00:00 2001
From: Akhil Narang <me@akhilnarang.dev>
Date: Fri, 24 May 2024 11:05:59 +0530
Subject: [PATCH] chore: resolve conflicts

---
 .../doctype/sales_invoice_item/sales_invoice_item.json      | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
index 5326a001047..932bc8e49d4 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -927,11 +927,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-02-25 15:56:44.828634",
-=======
  "modified": "2024-05-23 16:36:18.970862",
->>>>>>> 0303d7dbdc (fix: add in some indices to speed up Purchase Order deletion)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice Item",
@@ -941,4 +937,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": []
-}
\ No newline at end of file
+}