distribution date update

FB-G6 · Nov 15, 2022 · b9d7e6f · b9d7e6f
1 parent e55db2c
commit b9d7e6f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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
 
 /**