From cbe7931b3bd4a822836bd9d1c3c7bbd79f6bc72b Mon Sep 17 00:00:00 2001
From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
Date: Thu, 13 Aug 2026 15:22:38 +0530
Subject: [PATCH] fix: conflicts

---
 .../accounts/doctype/accounts_settings/accounts_settings.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
index 96a1e858fb6..3177d377267 100644
--- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -790,11 +790,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2026-07-27 12:00:00.000000",
-=======
  "modified": "2026-08-13 14:48:13.211701",
->>>>>>> 84cdd0daf0 (fix: describe stale exchange rate settings)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",