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