From 116a429c453cf46719a9050cd0ba73afe3ba2a69 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 17 Apr 2024 12:09:05 +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 7f89594ca70..cf08d08ce4b 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -1639,11 +1639,7 @@ "idx": 204, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2024-03-20 15:57:00.736868", -======= "modified": "2024-04-11 11:28:42.802211", ->>>>>>> c3845ac0f1 (fix: Allow updating cost center and project for repostable doctypes) "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice",