From 7673cc35aa1482d75a96ca37d3f92efbe81b8a4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Thu, 29 Feb 2024 19:15:09 +0100 Subject: [PATCH] Fix merge conflicts --- ros2controlcli/ros2controlcli/verb/list_controllers.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ros2controlcli/ros2controlcli/verb/list_controllers.py b/ros2controlcli/ros2controlcli/verb/list_controllers.py index 19461b7fa2..3628ef936c 100644 --- a/ros2controlcli/ros2controlcli/verb/list_controllers.py +++ b/ros2controlcli/ros2controlcli/verb/list_controllers.py @@ -23,9 +23,6 @@ def print_controller_state(c, args): -<<<<<<< HEAD - print(f'{c.name:20s}[{c.type:20s}] {c.state:10s}') -======= state_color = "" if c.state == "active": state_color = bcolors.OKGREEN @@ -35,7 +32,6 @@ def print_controller_state(c, args): state_color = bcolors.WARNING print(f"{c.name:20s}[{c.type:20s}] {state_color}{c.state:10s}{bcolors.ENDC}") ->>>>>>> 0711cd6 (Added spawner colours to `list_controllers` depending upon active or inactive (#1409)) if args.claimed_interfaces or args.verbose: print('\tclaimed interfaces:') for claimed_interface in c.claimed_interfaces: