Mercurial > dropbear

changeset 1068:9a6395ddb1b6 pam

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve merge properly
author Matt Johnston <matt@ucc.asn.au>
date Fri, 23 Jan 2015 22:32:49 +0800
parents 73ea0dce9a57
children 2fa71c3b2827
files common-session.c
diffstat 1 files changed, 0 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/common-session.c	Fri Jan 23 21:38:47 2015 +0800
+++ b/common-session.c	Fri Jan 23 22:32:49 2015 +0800
@@ -222,10 +222,6 @@
 		 * 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 @@
 
 		if (loophandler) {
 			loophandler();
->>>>>>> other
 		}
 
 	} /* for(;;) */