From 2bf76f64bd22ac88068c8d65b3d1e9ab3ee33719 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Fri, 7 Oct 2022 17:33:03 +0530
Subject: [PATCH] chore: resolve conflicts

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

diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 10151e9e553..fdd68c6e3ad 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -1437,11 +1437,7 @@
  "idx": 204,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2022-09-13 23:39:54.525037",
-=======
  "modified": "2022-10-07 14:19:14.214157",
->>>>>>> 781d160c68 (fix: Do not add tax withheld vouchers post tax withheding in one document)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice",
@@ -1505,4 +1501,4 @@
  "timeline_field": "supplier",
  "title_field": "title",
  "track_changes": 1
-}
\ No newline at end of file
+}