From fa0a49b86872bba004e240b6df8c3d650500f032 Mon Sep 17 00:00:00 2001
From: jturner <jturner@openbsd.org>
Date: Mon, 29 Sep 2014 22:57:54 +0000
Subject: Merge conflicts.

---
 lib/libsqlite3/tool/lemon.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib/libsqlite3/tool/lemon.c')

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;
-- 
cgit v1.2.3-59-g8ed1b