diff options
| author | Jeff Garzik <jeff@garzik.org> | 2012-05-22 17:45:00 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2012-05-22 17:45:00 -0400 |
| commit | 0134a1c08ce237b41470e62841af193e8a1e9457 (patch) | |
| tree | db38fb1b7343857e7df5c4698e2b9a821be0c36f /src/main.cpp | |
| parent | 5d0f7c4f47e6b9aa382846dd9b4a034e724d461a (diff) | |
| parent | ffe8b77a617efd802a9d4ba7e42b163fbd9a250b (diff) | |
| download | bitcoin-0134a1c08ce237b41470e62841af193e8a1e9457.tar.xz | |
Merge branch 'dbenv' into tmp
Conflicts:
src/db.cpp
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 546f8542a9..9a4d7abc8c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1463,7 +1463,6 @@ bool static Reorganize(CTxDB& txdb, CBlockIndex* pindexNew) if (!block.ConnectBlock(txdb, pindex)) { // Invalid block - txdb.TxnAbort(); return error("Reorganize() : ConnectBlock %s failed", pindex->GetBlockHash().ToString().substr(0,20).c_str()); } |