Rebase fix

Signed-off-by: tempate <[email protected]>
eProsima · Oct 24, 2023 · 0a045c8 · 0a045c8
1 parent b467b16
commit 0a045c8
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/fastddsspy_tool/src/cpp/tool/Backend.cpp b/fastddsspy_tool/src/cpp/tool/Backend.cpp
@@ -63,8 +63,6 @@ Backend::Backend(
         );
 
     // Create and initialize Pipe
-    ddspipe::core::DdsPipeConfiguration ddspipe_configuration;
-
     pipe_ = std::make_unique<ddspipe::core::DdsPipe>(
         configuration.ddspipe_configuration,
         discovery_database_,

diff --git a/fastddsspy_yaml/src/cpp/YamlReaderConfiguration.cpp b/fastddsspy_yaml/src/cpp/YamlReaderConfiguration.cpp
@@ -96,10 +96,7 @@ void Configuration::load_configuration_(
         WildcardDdsFilterTopic rpc_request_topic, rpc_response_topic;
         rpc_request_topic.topic_name.set_value("rq/*");
         rpc_response_topic.topic_name.set_value("rr/*");
-<<<<<<< HEAD
 
-=======
->>>>>>> 4c906f4 (Make the DdsPipeConfiguration required)
         ddspipe_configuration.blocklist.insert(
             utils::Heritable<WildcardDdsFilterTopic>::make_heritable(rpc_request_topic));
         ddspipe_configuration.blocklist.insert(