Skip to content

Commit c4b42aa

Browse files
committed
Merge bitcoin/bitcoin#22630: test: Add missing include
6666ec9 test: Add missing include (MarcoFalke) Pull request description: Fix the silent merge conflict introduced in commit 7d60f7e ACKs for top commit: fanquake: ACK 6666ec9 - fixes: Tree-SHA512: c712715db4a41cf6ed991fb35482d8fd9016b5a27e1309654018219ebbfd8d4f98a389bdf5d7b792e7a4690928aeef943c716465b0c5e00f70320ad2e134ebb5
2 parents 7d60f7e + 6666ec9 commit c4b42aa

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/test/miner_tests.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2011-2020 The Bitcoin Core developers
1+
// Copyright (c) 2011-2021 The Bitcoin Core developers
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

@@ -16,6 +16,7 @@
1616
#include <util/system.h>
1717
#include <util/time.h>
1818
#include <validation.h>
19+
#include <versionbits.h>
1920

2021
#include <test/util/setup_common.h>
2122

0 commit comments

Comments
 (0)