chore: resolve conflicts

2024-05-27 18:54:17 +02:00
parent b1a911aa9c
commit a53a80f01d
2 changed files with 0 additions and 8 deletions
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
@@ -82,11 +82,7 @@
 "icon": "fa fa-calendar",
 "idx": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2020-11-05 12:16:53.081573",
-=======
 "modified": "2024-05-27 17:29:55.560840",
->>>>>>> eaa4efbc45 (fix: allow Auditor to read a Fiscal Year)
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Fiscal Year",
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -712,11 +712,7 @@
 "image_field": "company_logo",
 "is_tree": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2023-10-23 10:19:24.322898",
-=======
 "modified": "2024-05-27 17:32:49.057386",
->>>>>>> 06401cc84f (fix: allow Auditor to select a company)
 "modified_by": "Administrator",
 "module": "Setup",
 "name": "Company",