From 6459c28316f7917e1ad733193f2ab16a89f453ea Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 10 Jul 2023 17:12:41 +0530 Subject: [PATCH] fix: 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 dfc4f3c9215..6fa71654f67 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -1574,11 +1574,7 @@ "idx": 204, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2023-04-29 12:57:50.832598", -======= - "modified": "2023-07-04 17:22:59.145031", ->>>>>>> d618aaef32 (fix: accepted warehouse and rejected warehouse can't be same) + "modified": "2023-07-04 17:23:59.145031", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice",