From 42b7be60ef3cb68040fa7985eaaf20c330486d25 Mon Sep 17 00:00:00 2001
From: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
Date: Tue, 27 Feb 2024 15:57:43 +0530
Subject: [PATCH] chore: resolve conflicts

---
 .../accounts/doctype/purchase_invoice/purchase_invoice.json   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index de81742ac00..813c70806f4 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -1610,11 +1610,7 @@
  "idx": 204,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-11-03 15:47:30.319200",
-=======
  "modified": "2024-02-25 11:20:28.366808",
->>>>>>> 9f6535472d (feat: update billed amount in PO and PR)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice",