Update CMakeLists.txt

ros-controls · Nov 18, 2024 · 6bc7938 · 6bc7938
1 parent 1767469
commit 6bc7938
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/control_msgs/CMakeLists.txt b/control_msgs/CMakeLists.txt
@@ -21,11 +21,7 @@ find_package(trajectory_msgs REQUIRED)
 
 set(msg_files
   msg/AdmittanceControllerState.msg
-<<<<<<< HEAD
-=======
   msg/DynamicInterfaceGroupValues.msg
-  msg/DynamicInterfaceValues.msg
->>>>>>> 0b9753e (Add Dynamic Interface Group Values message (#155))
   msg/DynamicJointState.msg
   msg/GripperCommand.msg
   msg/InterfaceValue.msg