Apply suggestions from code review

ros-controls · Aug 16, 2024 · ab67d75 · ab67d75
1 parent 088b182
commit ab67d75
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/ros2controlcli/ros2controlcli/verb/list_hardware_components.py b/ros2controlcli/ros2controlcli/verb/list_hardware_components.py
@@ -54,14 +54,7 @@ def main(self, *, args):
                     f"Hardware Component {idx+1}\n\tname: {activity_color}{component.name}{bcolors.ENDC}\n\ttype: {component.type}"
                 )
                 if hasattr(component, "plugin_name"):
-<<<<<<< HEAD
-                    plugin_name = component.plugin_name
-                # Keep compatibility to the obsolete filed name in Humble
-                elif hasattr(component, "class_type"):
-                    plugin_name = component.class_type
-=======
                     plugin_name = f"{component.plugin_name}"
->>>>>>> cce79eb (Make list controller and list hardware components immediately visualize the state. (#1606))
                 else:
                     plugin_name = f"{bcolors.WARNING}plugin name missing!{bcolors.ENDC}"