diff options
| author |   jturner <jturner@openbsd.org> | 2014-09-29 22:57:54 +0000 |
|---|---|---|
| committer | jturner <jturner@openbsd.org> | 2014-09-29 22:57:54 +0000 |
| commit | fa0a49b86872bba004e240b6df8c3d650500f032 (patch) | |
| tree | 5af7f2bfcf89ea797e40928a846edf857845dee7 /lib/libsqlite3/tool/lemon.c | |
| parent | Update sqlite3 to 3.8.6. A list of changes are available here: (diff) | |
| download | wireguard-openbsd-fa0a49b86872bba004e240b6df8c3d650500f032.tar.xz wireguard-openbsd-fa0a49b86872bba004e240b6df8c3d650500f032.zip | |
Merge conflicts.
Diffstat (limited to 'lib/libsqlite3/tool/lemon.c')
| -rw-r--r-- | lib/libsqlite3/tool/lemon.c | 3 |
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; |