Fixed a merge conflict in telnet.c

2017-04-07 07:55:40 +02:00
parent c780ad9cae
commit c4cee85b57
1 changed files with 0 additions and 5 deletions
--- a/telnet.c
+++ b/telnet.c
@ -173,13 +173,8 @@ int TelnetTask(void *pData)
            return 1;
          } else {
            snprintf(pBuffer,sizeof(pBuffer)-1, "Accepted telnet connection on handle %d",
-<<<<<<< HEAD
-                    self->pCon->sockHandle);
-            Log(INFO,"sys","%s",pBuffer);
-=======
 		     SCGetSockHandle(self->pCon));
            Log(INFO,"com","%s",pBuffer);
->>>>>>> conclean
            SendWelcome(self->pCon);
            SCSetRights(self->pCon, iRet);
            self->iLogin = 1;