From eadea0207c9841e120c763538982be7aa81ee79e Mon Sep 17 00:00:00 2001
From: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
Date: Tue, 27 Feb 2024 16:13:49 +0530
Subject: [PATCH] chore: resolve conflicts

---
 .../doctype/purchase_invoice/purchase_invoice.json        | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 70fe93b011f..a163640f25e 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -1628,11 +1628,7 @@
  "idx": 204,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-11-29 15:35:44.697496",
-=======
- "modified": "2024-02-25 11:20:28.366808",
->>>>>>> 9f6535472d (feat: update billed amount in PO and PR)
+ "modified": "2024-02-25 11:20:28.366808"
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice",
@@ -1695,4 +1691,4 @@
  "timeline_field": "supplier",
  "title_field": "title",
  "track_changes": 1
-}
\ No newline at end of file
+}