[Pkg-wmaker-commits] [wmbiff] 12/14: oops, looks like I resolved a conflict poorly

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to tag wmbiff_0_4_17
in repository wmbiff.

commit fd90e05dc5ac285d14864821e906a6305e93f56d
Author: bluehal <bluehal>
Date:   Sun Aug 31 06:47:33 2003 +0000

    oops, looks like I resolved a conflict poorly
---
 wmbiff/tlsComm.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/wmbiff/tlsComm.c b/wmbiff/tlsComm.c
index 1f2b1e1..2f37909 100644
--- a/wmbiff/tlsComm.c
+++ b/wmbiff/tlsComm.c
@@ -141,10 +141,6 @@ int getline_from_buffer(char *readbuffer, char *linebuffer, int linebuflen)
 	}
 
 	if (i != 0) {
-		/* grab the end of line too! */
-		i++;
-		/* advance past the newline */
-		p++;
 		/* copy a line into the linebuffer */
 		strncpy(linebuffer, readbuffer, (size_t) i);
 		/* sigh, null terminate */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbiff.git