diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-08-19 17:27:58 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-08-19 17:28:00 +0200 |
| commit | 80cddbbba99fc82e52e59cf0928fdc8d85cd29af (patch) | |
| tree | aaa43a89f0fe8843b565f817f6a2b9469c1b90e6 /src/merkleblock.cpp | |
| parent | a6f2affde878d4f16aee6aa81b0d5cf36afdbf2d (diff) | |
| parent | 9f68ed6b6d1a9c6436ce37913666165f2b180ee3 (diff) | |
| download | bitcoin-80cddbbba99fc82e52e59cf0928fdc8d85cd29af.tar.xz | |
Merge pull request #6539
9f68ed6 typofixes (found by misspell_fixer) (Veres Lajos)
Diffstat (limited to 'src/merkleblock.cpp')
| -rw-r--r-- | src/merkleblock.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp index 4d90fd8cd7..f8e877df25 100644 --- a/src/merkleblock.cpp +++ b/src/merkleblock.cpp @@ -168,7 +168,7 @@ uint256 CPartialMerkleTree::ExtractMatches(std::vector<uint256> &vMatch) { // traverse the partial tree unsigned int nBitsUsed = 0, nHashUsed = 0; uint256 hashMerkleRoot = TraverseAndExtract(nHeight, 0, nBitsUsed, nHashUsed, vMatch); - // verify that no problems occured during the tree traversal + // verify that no problems occurred during the tree traversal if (fBad) return uint256(); // verify that all bits were consumed (except for the padding caused by serializing it as a byte sequence) |