diff options
| author | laanwj <126646+laanwj@users.noreply.github.com> | 2022-02-22 12:38:12 +0100 |
|---|---|---|
| committer | laanwj <126646+laanwj@users.noreply.github.com> | 2022-02-22 13:08:08 +0100 |
| commit | 8add59d77dd621be57059229f378822e4b707318 (patch) | |
| tree | 488004fc4d8aae842df22ce255addd8f8acad0ba /src/validation.cpp | |
| parent | e200919cbe243133fd3b6db516263592549175ae (diff) | |
| parent | 48742693acc9de837735674057c9aae2fe90bd1d (diff) | |
| download | bitcoin-8add59d77dd621be57059229f378822e4b707318.tar.xz | |
Merge bitcoin/bitcoin#24367: User-facing content and codebase doc fixups from transifex translator feedback
48742693acc9de837735674057c9aae2fe90bd1d Replace "can not" with "cannot" in docs, user messages, and tests (Jon Atack)
e670edd43441ecb6e5978d65348501c57d856030 User-facing content fixups from transifex translator feedback (Jon Atack)
Pull request description:
Closes #24366.
ACKs for top commit:
laanwj:
Code review re-ACK 48742693acc9de837735674057c9aae2fe90bd1d
hebasto:
re-ACK 48742693acc9de837735674057c9aae2fe90bd1d, only suggested change since my previous [review](https://github.com/bitcoin/bitcoin/pull/24367#pullrequestreview-885938219).
Tree-SHA512: 4dcdcb417251a413e65fab6070515e13a1267c8e0dbcf521386b842511391f24c84a0c2168fe13458c977682034466509bf2a3453719d4d94d3c568fd9f4adb4
Diffstat (limited to 'src/validation.cpp')
| -rw-r--r-- | src/validation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index 86d0022947..035b5783c3 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2077,7 +2077,7 @@ bool CChainState::ConnectBlock(const CBlock& block, BlockValidationState& state, fEnforceBIP30 = fEnforceBIP30 && (!pindexBIP34height || !(pindexBIP34height->GetBlockHash() == m_params.GetConsensus().BIP34Hash)); // TODO: Remove BIP30 checking from block height 1,983,702 on, once we have a - // consensus change that ensures coinbases at those heights can not + // consensus change that ensures coinbases at those heights cannot // duplicate earlier coinbases. if (fEnforceBIP30 || pindex->nHeight >= BIP34_IMPLIES_BIP30_LIMIT) { for (const auto& tx : block.vtx) { |