- (djm) [channels.c] clean up harmless merge error, from reyk@

1 files changed, 0 insertions, 2 deletions

diff --git a/channels.c b/channels.c
index ed5903f6..5fa80fba 100644
--- a/channels.c
+++ b/channels.c
@@ -1491,8 +1491,6 @@ channel_handle_wfd(Channel *c, fd_set * readset, fd_set * writeset)
 			}
 			return 1;
 		}
-		data = buffer_ptr(&c->output);
-		dlen = buffer_len(&c->output);
 #ifdef _AIX
 		/* XXX: Later AIX versions can't push as much data to tty */
 		if (compat20 && c->wfd_isatty)