From 83ba5c5fb139d8b7d33a02fb076432e1494f925b Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Thu, 15 Dec 2022 12:28:11 +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 af16f8e1d8d..c5c8d00a292 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -1554,11 +1554,7 @@
  "idx": 204,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2022-11-27 16:28:45.559785",
-=======
- "modified": "2022-12-12 18:37:38.142688",
->>>>>>> e057e1dfe7 (feat: incoterm named place)
+ "modified": "2022-12-14 18:37:38.142688",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice",
@@ -1622,4 +1618,4 @@
  "timeline_field": "supplier",
  "title_field": "title",
  "track_changes": 1
-}
\ No newline at end of file
+}