diff options
Diffstat (limited to 'common-session.c')
| -rw-r--r-- | common-session.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/common-session.c b/common-session.c index 974ccd2..a262c6e 100644 --- a/common-session.c +++ b/common-session.c @@ -222,10 +222,6 @@ void session_loop() { * during rekeying ) */ channelio(&readfd, &writefd); -<<<<<<< local - if (ses.loop_handler) { - ses.loop_handler(); -======= /* process session socket's outgoing data */ if (ses.sock_out != -1) { if (!isempty(&ses.writequeue)) { @@ -236,7 +232,6 @@ void session_loop() { if (loophandler) { loophandler(); ->>>>>>> other } } /* for(;;) */ |