jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-21 10:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge issue

Browse Source
This commit is contained in:
fvanroie 2021-03-10 14:53:52 +01:00
parent 34e671f693
commit dbb160ac94
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sys/svc/hasp_telnet.cpp
View File

@ -84,16 +84,11 @@ void telnetAcceptClient()
// telnetClient.print((char)0xFD);
// telnetClient.print((char)0x1B);
<<<<<<< HEAD:src/sys/svc/hasp_telnet.cpp
#if HASP_USE_HTTP > 0 == == == =
#if HASP_USE_HTTP > 0
>>>>>>> master:src/svc/hasp_telnet.cpp
if(strlen(http_config.user) != 0 || strlen(http_config.password) != 0)
{
if(strlen(http_config.user) != 0 || strlen(http_config.password) != 0) {
telnetClient.println(F("\r\n" D_USERNAME " "));
telnetLoginState = TELNET_UNAUTHENTICATED;
}
else
} else
#endif
{
telnetClientLogon();