From 038fa4dbe231526117cb27b38a9dc9fa756cdb8a Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Fri, 30 Dec 2022 20:56:50 +0530
Subject: [PATCH] chore: resolve conflicts

---
 .../doctype/sales_invoice_item/sales_invoice_item.json       | 5 -----
 1 file changed, 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 1ef416cb115..091c00f0f11 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -843,12 +843,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2022-10-10 20:57:38.340026",
-=======
  "modified": "2022-12-28 16:17:33.484531",
->>>>>>> 617518389a (fix: Conversion factor error for invoices without item code (petty expenses) (#32714))
- "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice Item",
  "naming_rule": "Random",