resovled conflicts

This commit is contained in:
Ruixiang Du
2020-08-21 16:50:53 +08:00
82 changed files with 8838 additions and 130 deletions

View File

@@ -154,7 +154,7 @@ target_link_libraries(scout_webots_node ${catkin_LIBRARIES})
## Install ##
#############
roslaunch_add_file_check(launch)
# roslaunch_add_file_check(launch)
install(TARGETS scout_webots_node
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}