From c4cee85b57154d62824e8df70058fe8d5a30a33b Mon Sep 17 00:00:00 2001
From: koennecke <mark.koennecke@psi.ch>
Date: Fri, 7 Apr 2017 07:55:40 +0200
Subject: [PATCH] Fixed a merge conflict in telnet.c

---
 telnet.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/telnet.c b/telnet.c
index 9deaf9c0..e415f495 100644
--- 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;