Skip to content

Commit b6a5583

Browse files
author
MarcoFalke
committed
Merge #15853: wallet: Remove unused import checkpoints.h
fadf7d1 wallet: Remove unused import checkpoints.h (MarcoFalke) Pull request description: Yet another silent merge conflict. This one was caused by unsorted includes. ACKs for commit fadf7d: Tree-SHA512: b5bcbddfa0c443bd179cd239cb1d9942d904303d59ca72f97bcac8711f8d9cbdf96821c7fd33ed6c0f4ec9ec1ad72af176ffae11c5f19db861a0486022e321a5
2 parents ae2c19f + fadf7d1 commit b6a5583

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/wallet/wallet.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
// Copyright (c) 2009-2010 Satoshi Nakamoto
2-
// Copyright (c) 2009-2018 The Bitcoin Core developers
2+
// Copyright (c) 2009-2019 The Bitcoin Core developers
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

66
#include <wallet/wallet.h>
77

88
#include <chain.h>
9-
#include <checkpoints.h>
109
#include <consensus/consensus.h>
1110
#include <consensus/validation.h>
1211
#include <fs.h>

0 commit comments

Comments
 (0)