Skip to content

Commit

Permalink
tmp: fix silent merge conflict with bitcoin#30937
Browse files Browse the repository at this point in the history
  • Loading branch information
Sjors committed Oct 16, 2024
1 parent a1f543b commit e8d8aea
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/common/sockman.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or https://opensource.org/license/mit/.

#include <config/bitcoin-config.h> // IWYU pragma: keep
#include <bitcoin-build-config.h> // IWYU pragma: keep

#include <common/sockman.h>
#include <logging.h>
Expand Down

0 comments on commit e8d8aea

Please sign in to comment.