From b9d7e6ff54eb0aa8d79fc3f1f951cd71ded5d0ee Mon Sep 17 00:00:00 2001 From: adequator Date: Wed, 16 Nov 2022 01:06:23 +0300 Subject: [PATCH] distribution date update --- Marlin/Configuration_adv.h | 4 ++-- Marlin/src/inc/Version.h | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 049a53fc7fc7..3a5a1f6f1216 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -4197,8 +4197,8 @@ /** * WiFi Support (Espressif ESP32 WiFi) */ -#define WIFISUPPORT // Marlin embedded WiFi management -#define ESP3D_WIFISUPPORT // ESP3D Library WiFi management (https://github.com/luc-github/ESP3DLib) +//#define WIFISUPPORT // Marlin embedded WiFi management +//#define ESP3D_WIFISUPPORT // ESP3D Library WiFi management (https://github.com/luc-github/ESP3DLib) #if EITHER(WIFISUPPORT, ESP3D_WIFISUPPORT) #define WEBSUPPORT // Start a webserver (which may include auto-discovery) diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index d8979a3f4c86..15899378087f 100644 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -42,11 +42,7 @@ * version was tagged. */ #ifndef STRING_DISTRIBUTION_DATE -<<<<<<< HEAD - #define STRING_DISTRIBUTION_DATE "2022-11-13" -======= #define STRING_DISTRIBUTION_DATE "2022-11-15" ->>>>>>> 8298a477e1f1fa6188788448eec3f349c1ba93de #endif /**