merged

[henge/apc.git] / src / scanner.c

diff --git a/src/scanner.c b/src/scanner.c
index 55245af..36a2050 100644 (file)
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -143,11 +143,7 @@ int scanner
   if (DL_CD_LEN() > 0)               //There are entities to process
     { if (DL_CD_POP() == NULL)            //If the dirent is null, then the
         goto libfail;                       //lib function in dirent has failed
-<<<<<<< HEAD
       ntok += lexer_lexstring(DL_CD_CURNAME());//lex the directory name
-=======
-      ntok += lexer_lexstring(DL_CD_CURNAME());  //lex the directory name
->>>>>>> 15d3ab5e7871ff459af13089b82bf5f17f731ebd
       if (DL_LEN() >= DL_STACKSIZE)       //fail if maxdepth exceeded
         { fprintf(stderr, ERR_DEPTH);
           goto fail;