From 03849ecc2f720d13f6b34a7874440e540eb2bf99 Mon Sep 17 00:00:00 2001
From: "Dr. Denis" <denis@stoglrobotics.de>
Date: Fri, 16 Aug 2024 14:40:24 +0200
Subject: [PATCH] Apply suggestions from code review

---
 controller_manager/test/test_spawner_unspawner.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/controller_manager/test/test_spawner_unspawner.cpp b/controller_manager/test/test_spawner_unspawner.cpp
index e37ea46c9f..526ed7bd2c 100644
--- a/controller_manager/test/test_spawner_unspawner.cpp
+++ b/controller_manager/test/test_spawner_unspawner.cpp
@@ -277,8 +277,6 @@ TEST_F(TestLoadController, unload_on_kill)
   ASSERT_EQ(cm_->get_loaded_controllers().size(), 0ul);
 }
 
-<<<<<<< HEAD
-=======
 TEST_F(TestLoadController, spawner_test_fallback_controllers)
 {
   const std::string test_file_path = ament_index_cpp::get_package_prefix("controller_manager") +
@@ -360,7 +358,6 @@ TEST_F(TestLoadController, spawner_with_many_controllers)
   }
 }
 
->>>>>>> 80c264f (Robustify controller spawner and add integration test with many controllers (#1501))
 class TestLoadControllerWithoutRobotDescription
 : public ControllerManagerFixture<controller_manager::ControllerManager>
 {