mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-06-02 19:22:22 +02:00
Merge bitcoin/bitcoin#22630: test: Add missing include
6666ec9e059ea66065a11f5e25c0a17d7d0834fe test: Add missing include (MarcoFalke) Pull request description: Fix the silent merge conflict introduced in commit 7d60f7ec6bbf293c6f23f442a0fd985111a15ff7 ACKs for top commit: fanquake: ACK 6666ec9e059ea66065a11f5e25c0a17d7d0834fe - fixes: Tree-SHA512: c712715db4a41cf6ed991fb35482d8fd9016b5a27e1309654018219ebbfd8d4f98a389bdf5d7b792e7a4690928aeef943c716465b0c5e00f70320ad2e134ebb5
This commit is contained in:
commit
c4b42aa4ff
@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2011-2020 The Bitcoin Core developers
|
||||
// Copyright (c) 2011-2021 The Bitcoin Core developers
|
||||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
#include <util/system.h>
|
||||
#include <util/time.h>
|
||||
#include <validation.h>
|
||||
#include <versionbits.h>
|
||||
|
||||
#include <test/util/setup_common.h>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user