From ef01ac697787133c2ce3c5d343f9acf5b26d3ffa Mon Sep 17 00:00:00 2001
From: Nicholas Dudfield <ndudfield@gmail.com>
Date: Fri, 20 Feb 2026 11:12:02 +0700
Subject: [PATCH] fix: remove leftover conflict marker text in
 RippledCore.cmake

---
 Builds/CMake/RippledCore.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Builds/CMake/RippledCore.cmake b/Builds/CMake/RippledCore.cmake
index 01925556b..14d66edc2 100644
--- a/Builds/CMake/RippledCore.cmake
+++ b/Builds/CMake/RippledCore.cmake
@@ -47,7 +47,7 @@ target_sources(
           src/ripple/beast/utility/src/beast_Journal.cpp
           src/ripple/beast/utility/src/beast_PropertyStream.cpp
           # Enhanced logging - compiles to empty when BEAST_ENHANCED_LOGGING is not defined
-          src/ripple/beast/utility/src/beast_EnhancedLogging.cpp) origin/dev
+          src/ripple/beast/utility/src/beast_EnhancedLogging.cpp)
 
 #[===============================[
     core sources