From a53a80f01d79d0d998405155edccbecbd8133a7b Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Mon, 27 May 2024 18:54:17 +0200
Subject: [PATCH] chore: resolve conflicts

---
 erpnext/accounts/doctype/fiscal_year/fiscal_year.json | 4 ----
 erpnext/setup/doctype/company/company.json            | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
index 24962f2088e..496dd44ad86 100644
--- 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",
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index 7b300d57195..70a0872a2c4 100644
--- 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",