From e8d8aead6a1e511f965deb636c64f62d90a779fd Mon Sep 17 00:00:00 2001
From: Sjors Provoost <sjors@sprovoost.nl>
Date: Wed, 16 Oct 2024 12:18:32 +0100
Subject: [PATCH] tmp: fix silent merge conflict with bitcoin/bitcoin#30937

---
 src/common/sockman.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/sockman.cpp b/src/common/sockman.cpp
index 335eed05cc07a..e59f77b894ce4 100644
--- a/src/common/sockman.cpp
+++ b/src/common/sockman.cpp
@@ -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>