From 6d17cb5decebe65e1abb93827f71f7b9bf7b5c5e Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Sat, 26 Jan 2019 16:00:03 +0800 Subject: [PATCH] oopps --- src/txdb.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/txdb.cpp b/src/txdb.cpp index f36989028..b798599b7 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -689,15 +689,7 @@ bool CBlockTreeDB::LoadBlockIndexGuts() pindexNew->nTx = diskindex.nTx; pindexNew->nSproutValue = diskindex.nSproutValue; pindexNew->nSaplingValue = diskindex.nSaplingValue; -<<<<<<< HEAD - pindexNew->segid = diskindex.segid; - pindexNew->newcoins = diskindex.newcoins; - pindexNew->zfunds = diskindex.zfunds; - pindexNew->sproutfunds = diskindex.sproutfunds; - -======= //fprintf(stderr,"loadguts ht.%d\n",pindexNew->GetHeight()); ->>>>>>> b778dbef8e85f3f95e36223beb41d4d51eb6072e // Consistency checks auto header = pindexNew->GetBlockHeader(); if (header.GetHash() != pindexNew->GetBlockHash())