sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 20:12:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#22630: test:Add missing include

Browse Source 
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:
fanquake 2021-08-05 15:58:51 +08:00 committed by pasta
parent baf8161d7c
commit 4be68dd34a
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/miner_tests.cpp
View File

@ -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 // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -23,6 +23,7 @@
#include <util/system.h> #include <util/system.h>
#include <util/time.h> #include <util/time.h>
#include <validation.h> #include <validation.h>
#include <versionbits.h>
#include <test/util/setup_common.h> #include <test/util/setup_common.h>