From fde1ff5bf6ffe9b18bfa39da26559437cd47a47f Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sat, 5 Dec 1998 03:42:17 +0000 Subject: [PATCH] Fix last fix. --- servers/slapd/tools/ldif2id2entry.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/servers/slapd/tools/ldif2id2entry.c b/servers/slapd/tools/ldif2id2entry.c index ebb8ab6b94..e2de205be3 100644 --- a/servers/slapd/tools/ldif2id2entry.c +++ b/servers/slapd/tools/ldif2id2entry.c @@ -152,10 +152,6 @@ main( int argc, char **argv ) len = strlen( line ); if ( buf == NULL || *buf == '\0' ) { -<<<<<<< ldif2id2entry.c - sprintf( idbuf, "%d\n", id + 1 ); - idlen = strlen( idbuf ); -======= if (!isdigit(line[0])) { sprintf( idbuf, "%d\n", id + 1 ); idlen = strlen( idbuf ); @@ -163,7 +159,6 @@ main( int argc, char **argv ) id = atol(line) - 1; idlen = 0; } ->>>>>>> 1.4.2.3 } else { idlen = 0; } -- 2.47.2