From a0a2418b2a5a549b773a814bf896b1a63f16985f Mon Sep 17 00:00:00 2001
From: positionhigh <positionhigh@noreply.codeberg.org>
Date: Wed, 18 Aug 2021 13:58:05 +0200
Subject: [PATCH] =?UTF-8?q?Dateien=20hochladen=20nach=20=E2=80=9E=E2=80=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/config.h b/config.h
index 2ee94f7..ff687b6 100644
--- a/config.h
+++ b/config.h
@@ -630,9 +630,11 @@
 #define EQ_7_MAX 10
 #define EQ_7_DEFAULT 0
 
-// Buffer size for load/save configuration as JSON
+// Buffer for load/save configuration as JSON
 
-#define JSON_BUFFER 8192 //This line put back to resolve a merge conflict. this line should be removed
+#define JSON_BUFFER 8192
+
+// JSON_BUFFER line above can be deleted, put this back in to resolve conflict.
 
 #define JSON_BUFFER_SIZE 8192