Merge 39bd9ddb87 into merged_master (Bitcoin PR #19295)

This commit is contained in:
Andrew Poelstra 2020-11-26 01:09:07 +00:00
commit 99d485db22
3 changed files with 3 additions and 6 deletions

View file

@ -1755,8 +1755,6 @@ bool UndoReadFromDisk(CBlockUndo& blockundo, const CBlockIndex* pindex)
return true;
}
constexpr auto AbortError = InitError;
/** Abort with a message */
static bool AbortNode(const std::string& strMessage, bilingual_str user_message = bilingual_str())
{