From dbc9ad1fd9358ece10d4b844cd9a472d33aa8222 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 14 Mar 2017 22:04:03 +0200 Subject: [PATCH] Resolve --- src/main.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 8f3fdfddd..31ee26c8e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -875,11 +875,7 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state, { static uint32_t counter; if ( counter++ < 100 ) -<<<<<<< Updated upstream printf("MEMPOOL: banned tx.%d being used at ht.%d vini.%d\n",k,(int32_t)chainActive.Tip()->nHeight,j); -======= - fprintf(stderr,"MEMPOOL: banned tx.%d being used at ht.%d vini.%d\n",k,(int32_t)chainActive.Tip()->nHeight,j); ->>>>>>> Stashed changes return(false); } }