diff --git a/prf-ros-controllers/Makefile b/prf-ros-controllers/Makefile index 0f3061732e14547023140bd6caddcfe48e3f9cf4..4de4b05a5fbfe388f02459a3824a099fdb12cae2 100644 --- a/prf-ros-controllers/Makefile +++ b/prf-ros-controllers/Makefile @@ -20,6 +20,8 @@ LICENSE= 2-clause-bsd ROS_METAPKG= yes +CONFLICTS= talos-ros-controllers + # Allows to have robotpkg ros packages with the highest priority # over system ros packages. # http://wiki.ros.org/catkin/what