2 files changed, 4 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 60ea75fd4..f5e287dc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 20060103
+ - (djm) [channels.c] clean up harmless merge error, from reyk@
+
+20060103
  - (djm) OpenBSD CVS Sync
    - jmc@cvs.openbsd.org 2006/01/02 17:09:49
      [ssh_config.5 sshd_config.5]
@@ -3628,4 +3631,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4072 2006/01/03 07:47:31 djm Exp $
+$Id: ChangeLog,v 1.4073 2006/01/03 20:27:50 djm Exp $
diff --git a/channels.c b/channels.c
index ed5903f6f..5fa80fbad 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)