From 303ae8321b271aef96f5de61d7bc0ff8b3ee6d80 Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Mon, 28 Oct 2024 13:33:24 +0530
Subject: [PATCH] chore: resolve conflict

---
 .../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 b6205af0fdf..6b21ec5b678 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -1633,11 +1633,7 @@
  "idx": 204,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-09-11 12:59:19.130593",
-=======
  "modified": "2024-10-25 18:13:01.944477",
->>>>>>> 912e1e3f3d (fix: hide payment terms for return and paid purchase invoices)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice",