From 94d1fd6c42d3b3b199a5f2a470f9f5243a55943a Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Mon, 13 Jul 2026 11:54:45 +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 29057334ed0..8e9da9baa9d 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -1662,11 +1662,7 @@
  "idx": 204,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2026-03-17 20:44:00.221219",
-=======
  "modified": "2026-07-12 23:54:21.263951",
->>>>>>> 6729a53fee (fix: make represents company field in purchase invoice ignore user permissions)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice",