From 0c2f1c701978daf703a9c5224d8b412321710594 Mon Sep 17 00:00:00 2001
From: Coscolin <coscolin.sergio@gmail.com>
Date: Sun, 4 Feb 2024 18:21:30 +0100
Subject: [PATCH] Dejar como master melkati

---
 CO2_Gadget_Menu.h | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/CO2_Gadget_Menu.h b/CO2_Gadget_Menu.h
index 3181b6c2..8a1dea86 100644
--- a/CO2_Gadget_Menu.h
+++ b/CO2_Gadget_Menu.h
@@ -88,8 +88,6 @@ char tempMQTTUser[] = "                              ";
 char tempMQTTPass[] = "                              ";
 char tempWiFiSSID[] = "                              ";
 char tempWiFiPasswrd[] = "                              ";
-char tempWiFiSSID2[] = "                              ";
-char tempWiFiPasswrd2[] = "                              ";
 char tempHostName[] = "                              ";
 char tempBLEDeviceId[] = "                              ";
 char tempCO2Sensor[] = "                              ";
@@ -404,16 +402,8 @@ TOGGLE(activeOTA, activeOTAMenu, "OTA Enable: ", doNothing,noEvent, wrapStyle
 
 MENU(wifiConfigMenu, "WIFI Config", doNothing, noEvent, wrapStyle
   ,SUBMENU(activeWIFIMenu)
-<<<<<<< HEAD
-  ,SUBMENU(searchWIFIMenu)
   ,EDIT("SSID", tempWiFiSSID, ssidChars, doSetWiFiSSID, exitEvent, wrapStyle)
   ,EDIT("Pass:", tempWiFiPasswrd, allChars, doSetWiFiPasswrd, exitEvent, wrapStyle)
-=======
-  ,EDIT("SSID1", tempWiFiSSID, ssidChars, doSetWiFiSSID, exitEvent, wrapStyle)
-  ,EDIT("PASS1:", tempWiFiPasswrd, allChars, doSetWiFiPasswrd, exitEvent, wrapStyle)
-  ,EDIT("SSID2", tempWiFiSSID2, ssidChars, doSetWiFiSSID2, exitEvent, wrapStyle)
-  ,EDIT("PASS2:", tempWiFiPasswrd2, allChars, doSetWiFiPasswrd2, exitEvent, wrapStyle)
->>>>>>> 56fa71210855b96b41690aad2566683b671c8fe7
   ,EDIT("Host:", tempHostName, allChars, doSetHostName, exitEvent, wrapStyle)
 #ifdef SUPPORT_OTA
   ,SUBMENU(activeOTAMenu)