diff options
| author | Gabriel Pérez <[email protected]> | 2021-05-14 12:59:02 -0400 |
|---|---|---|
| committer | Gabriel Pérez <[email protected]> | 2021-05-14 12:59:02 -0400 |
| commit | 548ffd6ed2f90018aa97549a6fb5c33659c0f193 (patch) | |
| tree | f036b3b381f0b4bcd4836255de9e97c148147934 /src/validation.cpp | |
| parent | Updating Dogecoin references in CONTRIBUTING (diff) | |
| parent | Merge pull request #1844 from pmzajaczkowski/fixing-polish-translations (diff) | |
| download | discoin-548ffd6ed2f90018aa97549a6fb5c33659c0f193.tar.xz discoin-548ffd6ed2f90018aa97549a6fb5c33659c0f193.zip | |
Merge branch '1.14.4-dev' of github.com:dogecoin/dogecoin into remove-bitcoin-references
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 c21c78467..6b5dcb188 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2516,7 +2516,7 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams, // state of transactions in our wallet is currently cleared when we // receive another notification and there is a race condition where // notification of a connected conflict might cause an outside process - // to abandon a transaction and then have it inadvertantly cleared by + // to abandon a transaction and then have it inadvertently cleared by // the notification that the conflicted transaction was evicted. MemPoolConflictRemovalTracker mrt(mempool); CBlockIndex *pindexOldTip = chainActive.Tip(); |