Resolve conflicts.

ros-controls · Dec 12, 2023 · 9e8e263 · 9e8e263
1 parent b0477d4
commit 9e8e263
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 24 deletions.
diff --git a/controller_manager/controller_manager/__init__.py b/controller_manager/controller_manager/__init__.py
@@ -26,26 +26,14 @@
 )
 
 __all__ = [
-<<<<<<< HEAD
     'configure_controller',
     'list_controller_types',
     'list_controllers',
     'list_hardware_components',
     'list_hardware_interfaces',
     'load_controller',
     'reload_controller_libraries',
+    'set_hardware_component_state',
     'switch_controllers',
     'unload_controller',
-=======
-    "configure_controller",
-    "list_controller_types",
-    "list_controllers",
-    "list_hardware_components",
-    "list_hardware_interfaces",
-    "load_controller",
-    "reload_controller_libraries",
-    "set_hardware_component_state",
-    "switch_controllers",
-    "unload_controller",
->>>>>>> 937817c (add spawner for hardware (#941))
 ]
diff --git a/controller_manager/controller_manager/controller_manager_services.py b/controller_manager/controller_manager/controller_manager_services.py
@@ -12,11 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-from controller_manager_msgs.srv import ConfigureController, \
-    ListControllers, ListControllerTypes, ListHardwareComponents, ListHardwareInterfaces, \
-    LoadController, ReloadControllerLibraries, SwitchController, UnloadController
-=======
 from controller_manager_msgs.srv import (
     ConfigureController,
     ListControllers,
@@ -29,7 +24,6 @@
     SwitchController,
     UnloadController,
 )
->>>>>>> 937817c (add spawner for hardware (#941))
 
 import rclpy
 
@@ -99,10 +93,6 @@ def reload_controller_libraries(node, controller_manager_name, force_kill):
                           ReloadControllerLibraries, request)
 
 
-<<<<<<< HEAD
-def switch_controllers(node, controller_manager_name, deactivate_controllers,
-                       activate_controllers, strict, activate_asap, timeout):
-=======
 def set_hardware_component_state(node, controller_manager_name, component_name, lifecyle_state):
     request = SetHardwareComponentState.Request()
     request.name = component_name
@@ -124,7 +114,6 @@ def switch_controllers(
     activate_asap,
     timeout,
 ):
->>>>>>> 937817c (add spawner for hardware (#941))
     request = SwitchController.Request()
     request.activate_controllers = activate_controllers
     request.deactivate_controllers = deactivate_controllers