From 510ab769f15f41d7773ec70efad30c7f4b084e92 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Wed, 31 Jan 2024 15:23:14 +0530
Subject: [PATCH] chore: fix conflicts

---
 erpnext/buying/doctype/buying_settings/buying_settings.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.json b/erpnext/buying/doctype/buying_settings/buying_settings.json
index 7e57bbf2df..ae854f2934 100644
--- a/erpnext/buying/doctype/buying_settings/buying_settings.json
+++ b/erpnext/buying/doctype/buying_settings/buying_settings.json
@@ -214,11 +214,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-01-30 14:04:43.177427",
-=======
  "modified": "2024-01-31 13:34:18.101256",
->>>>>>> 0c9572bb48 (fix: conditionally display show btn setting)
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Buying Settings",
@@ -268,4 +264,4 @@
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
\ No newline at end of file
+}