aboutsummaryrefslogtreecommitdiff
path: root/src/merkleblock.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2015-08-19 17:27:58 +0200
committerWladimir J. van der Laan <[email protected]>2015-08-19 17:28:00 +0200
commit80cddbbba99fc82e52e59cf0928fdc8d85cd29af (patch)
treeaaa43a89f0fe8843b565f817f6a2b9469c1b90e6 /src/merkleblock.cpp
parentMerge pull request #6565 (diff)
parenttypofixes (found by misspell_fixer) (diff)
downloaddiscoin-80cddbbba99fc82e52e59cf0928fdc8d85cd29af.tar.xz
discoin-80cddbbba99fc82e52e59cf0928fdc8d85cd29af.zip
Merge pull request #6539
9f68ed6 typofixes (found by misspell_fixer) (Veres Lajos)
Diffstat (limited to 'src/merkleblock.cpp')
-rw-r--r--src/merkleblock.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp
index 4d90fd8cd..f8e877df2 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)