Fix Mergify conflict

eProsima · Oct 3, 2023 · b469567 · b469567
1 parent edb12f3
commit b469567
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/test/blackbox/api/dds-pim/PubSubWriter.hpp b/test/blackbox/api/dds-pim/PubSubWriter.hpp
@@ -1395,8 +1395,6 @@ class PubSubWriter
         return (ReturnCode_t::RETCODE_OK == publisher_->set_qos(publisher_qos_));
     }
 
-<<<<<<< HEAD
-=======
     bool set_qos()
     {
         return (ReturnCode_t::RETCODE_OK == datawriter_->set_qos(datawriter_qos_));
@@ -1413,7 +1411,6 @@ class PubSubWriter
         return (datawriter_->get_qos());
     }
 
->>>>>>> b84825a5b (Updatable disable_positive_acks period (#3879))
     bool remove_all_changes(
             size_t* number_of_changes_removed)
     {