Skip to content

Commit

Permalink
Merge bitcoin#22630: test: Add missing include
Browse files Browse the repository at this point in the history
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
  • Loading branch information
fanquake authored and vijaydasmp committed Nov 8, 2023
1 parent f4b6c81 commit d765574
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/test/miner_tests.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2011-2015 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.

Expand All @@ -23,6 +23,7 @@
#include <util/system.h>
#include <util/time.h>
#include <validation.h>
#include <versionbits.h>

#include <test/util/setup_common.h>

Expand Down

0 comments on commit d765574

Please sign in to comment.