From f86f4a2b3e8862bb35bcaba7996459c6e3b460dc Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Mon, 17 Nov 2025 11:21:36 +0100
Subject: [PATCH] fix fi

---
 misc/build.func | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/misc/build.func b/misc/build.func
index 72b1fb9d5..c2364cb60 100644
--- a/misc/build.func
+++ b/misc/build.func
@@ -1552,14 +1552,8 @@ advanced_settings() {
 # diagnostics_check()
 #
 # - Ensures diagnostics config file exists at /usr/local/community-scripts/diagnostics
-<<<<<<< Updated upstream
 # - Asks user whether to send anonymous diagnostic data
 # - Saves DIAGNOSTICS=yes/no in the config file
-=======
-# - Creates file if missing with default DIAGNOSTICS=yes
-# - Reads current diagnostics setting from file
-# - Sets global DIAGNOSTICS variable for API telemetry opt-in/out
->>>>>>> Stashed changes
 # ------------------------------------------------------------------------------
 diagnostics_check() {
   if ! [ -d "/usr/local/community-scripts" ]; then