summaryrefslogtreecommitdiffstats
path: root/lib/libsqlite3/tool/lemon.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libsqlite3/tool/lemon.c')
-rw-r--r--lib/libsqlite3/tool/lemon.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/libsqlite3/tool/lemon.c b/lib/libsqlite3/tool/lemon.c
index d7179ad4237..85e94f7007f 100644
--- a/lib/libsqlite3/tool/lemon.c
+++ b/lib/libsqlite3/tool/lemon.c
@@ -1183,8 +1183,7 @@ static int resolve_conflict(
apx->type = SH_RESOLVED;
}else{
assert( spx->prec==spy->prec && spx->assoc==NONE );
- apy->type = SRCONFLICT;
- errcnt++;
+ apx->type = ERROR;
}
}else if( apx->type==REDUCE && apy->type==REDUCE ){
spx = apx->x.rp->precsym;