TheRealMoeder
diff --git a/‎src/main.cpp‎
Lines changed: 0 additions & 7 deletions b/‎src/main.cpp‎
Lines changed: 0 additions & 7 deletions
@@ -51,12 +51,6 @@ void setup(void) {
     }
   }
 
-<<<<<<< HEAD
-  // Set up web server and endpoints
-
-  server.on("/", AsyncWebRequestMethod::HTTP_GET, [](AsyncWebServerRequest *request) {
-    request->send(200, "text/plain", "This is the Energy2Shelly for ESP converter!\r\nDevice and Energy status is available under /status\r\nTo reset configuration, goto /reset\r\n");
-=======
   server.on("/", HTTP_GET, [](AsyncWebServerRequest *request) {
     String html = R"=====(
 <!DOCTYPE html>
@@ -87,7 +81,6 @@ void setup(void) {
 </html>
 )=====";
     request->send(200, "text/html", html);
->>>>>>> eefc51d (feat: enhance homepage with improved HTML layout and navigation links)
   });
 
   server.on("/shelly", AsyncWebRequestMethod::HTTP_GET, [](AsyncWebServerRequest *request) {