diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-05-11 13:40:57 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-05-11 13:41:03 +0200 |
| commit | c1409d11ad30ff6da37d8bcabe374d42edacb41d (patch) | |
| tree | 7b22305303ccdb614b4ba5df06706bd7fa26b3ae /qa | |
| parent | 23254131a3fdaeae9c50dafca6d0addbbf235820 (diff) | |
| parent | a681663e288847f05145e5586d75462a34c81fca (diff) | |
| download | bitcoin-c1409d11ad30ff6da37d8bcabe374d42edacb41d.tar.xz | |
Merge pull request #6073
a681663 clarify that there are only two nodes (Jameson Lopp)
Diffstat (limited to 'qa')
| -rwxr-xr-x | qa/rpc-tests/conflictedbalance.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/rpc-tests/conflictedbalance.sh b/qa/rpc-tests/conflictedbalance.sh index 3b6c8dc318..7e44097374 100755 --- a/qa/rpc-tests/conflictedbalance.sh +++ b/qa/rpc-tests/conflictedbalance.sh @@ -49,7 +49,7 @@ B2ARGS="-datadir=$D2 -debug=mempool" $BITCOIND $B2ARGS & B2PID=$! -# Wait until all four nodes are at the same block number +# Wait until both nodes are at the same block number function WaitBlocks { while : do |