diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2015-01-23 22:32:49 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2015-01-23 22:32:49 +0800 |
| commit | 8333636f62e396197b2de12fdaa27ac783fe4f30 (patch) | |
| tree | 31dd7a096c136afa3cfb51b71cfd5f1cbb1492c3 | |
| parent | d3ef9b184aec7069777a7a3ceb1931e81d513c79 (diff) | |
| download | dropbear-8333636f62e396197b2de12fdaa27ac783fe4f30.tar.gz | |
resolve merge properly
| -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(;;) */ |