From 99d5b6dc71b3f471e6aa6a2761fdd0fe2ef28b55 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 24 Jul 2024 13:03:43 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/accounts/doctype/journal_entry/journal_entry.json | 4 ---- .../accounts/doctype/purchase_invoice/purchase_invoice.json | 4 ---- erpnext/accounts/doctype/sales_invoice/sales_invoice.json | 4 ---- 3 files changed, 12 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.json b/erpnext/accounts/doctype/journal_entry/journal_entry.json index 021c9e19c15..b229a20f7eb 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.json +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json @@ -557,11 +557,7 @@ "table_fieldname": "payment_entries" } ], -<<<<<<< HEAD - "modified": "2023-11-23 12:11:04.128015", -======= "modified": "2024-07-18 15:32:29.413598", ->>>>>>> e81373bb6a (chore: remove 'repost_required' from Journal Entry) "modified_by": "Administrator", "module": "Accounts", "name": "Journal Entry", diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json index 6c6f8537d4a..7568e3486e5 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -1609,11 +1609,7 @@ "idx": 204, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2024-03-20 15:57:00.736868", -======= "modified": "2024-07-18 15:31:49.488566", ->>>>>>> a467888a67 (chore: remove 'repost_required' from purchase invoice) "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice", diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 3fea7dcab5d..632392511bd 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -2183,11 +2183,7 @@ "link_fieldname": "consolidated_invoice" } ], -<<<<<<< HEAD - "modified": "2024-05-08 18:02:28.549041", -======= "modified": "2024-07-18 15:30:39.428519", ->>>>>>> 06c5334f2a (chore: remove stale 'repost_required' flag from sales invoice) "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice",