Issue #329 - Experimental fix?

Author: geoffmcl

src/lexer.c

@@ -144,11 +144,7 @@ static void Show_Node( TidyDocImpl* doc, const char *msg, Node *node )
     tmbstr src = lex ? "lexer" : "stream";
     SPRTF("R=%d C=%d: ", line, col );
     // DEBUG: Be able to set a TRAP on a SPECIFIC row,col
-<<<<<<< HEAD
     if ((line == 67) && (col == 95)) {
-=======
-    if ((line == 8) && (col == 4)) {
->>>>>>> Issue #329 - Experimental fix?
         check_me("Show_Node"); // just a debug trap
     }
     if (lexer && lexer->token &&