mirror of
https://github.com/Xahau/xahaud.git
synced 2026-04-29 15:37:46 +00:00
fix: remove leftover conflict marker text in RippledCore.cmake
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user