From 52e45623e844fd6819e696c40e8476167365f979 Mon Sep 17 00:00:00 2001
From: jwinterm <johnwmurphy@gmail.com>
Date: Thu, 11 Jun 2026 06:51:09 -0400
Subject: [PATCH] Fix dangling #endif + resolve lwsf_config.h merge markers
 (keep wownero mixin 21 + ping_timeout)

---
 src/lwsf_config.h | 4 ----
 src/wallet.cpp    | 1 -
 2 files changed, 5 deletions(-)

diff --git a/src/lwsf_config.h b/src/lwsf_config.h
index 9d66d4c..7967846 100644
--- a/src/lwsf_config.h
+++ b/src/lwsf_config.h
@@ -58,12 +58,8 @@ namespace lwsf { namespace config
   constexpr const std::size_t max_ring_size_in_rpc = 128;
   constexpr const std::size_t max_txes_in_rpc = 2048;
   constexpr const std::size_t min_outputs = 2;
-<<<<<<< HEAD
   constexpr const std::uint32_t mixin_default = 21; // Wownero ring size 22 (mixin + 1)
-=======
-  constexpr const std::uint32_t mixin_default = 15;
   constexpr const std::chrono::seconds ping_timeout{10};
->>>>>>> upstream/main
   constexpr const std::chrono::seconds refresh_interval{30};
   constexpr const std::chrono::seconds refresh_interval_min{5};
   constexpr const std::chrono::seconds rpc_timeout{30};
diff --git a/src/wallet.cpp b/src/wallet.cpp
index ce1fc29..ef7af3d 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -2202,6 +2202,5 @@ namespace lwsf { namespace internal
     status = std::move(import->status);
     return true;
   }
-#endif // LWSF_MASTER_ENABLE
 
 }} // lwsf // internal