DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Resolve

Browse Source
This commit is contained in:
jl777
2017-03-14 22:04:03 +02:00
parent d1775ced1e
commit dbc9ad1fd9
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.cpp
View File

@@ -875,11 +875,7 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state,
{ {
static uint32_t counter; static uint32_t counter;
if ( counter++ < 100 ) 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); 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); return(false);
} }
} }