From de3a423618cb66bb5181c8bb93c02a51851229e7 Mon Sep 17 00:00:00 2001
From: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
Date: Fri, 19 Apr 2024 13:32:39 +0530
Subject: [PATCH] chore: resolve conflicts

---
 erpnext/accounts/doctype/fiscal_year/fiscal_year.json | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
index 2d58606b5ce..ff4ac50850f 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
@@ -86,12 +86,7 @@
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Fiscal Year",
-<<<<<<< HEAD
  "owner": "Administrator",
-=======
- "naming_rule": "By fieldname",
-  "owner": "Administrator",
->>>>>>> 572e844a91 (fix: account and stock manager read perm)
  "permissions": [
   {
    "create": 1,
@@ -136,4 +131,4 @@
  "show_name_in_global_search": 1,
  "sort_field": "name",
  "sort_order": "DESC"
-}
\ No newline at end of file
+}