From 042a8486d688e544eb06fc56cb4cabd20bb01756 Mon Sep 17 00:00:00 2001 From: Giang Nguyen Date: Fri, 14 Jul 2023 11:34:15 +0200 Subject: [PATCH] Fix merge --- .../src/multiverse_connectors/multiverse_mujoco_connector | 2 +- .../src/multiverse_core/multiverse_client/CMakeLists.txt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/multiverse_ws/src/multiverse_connectors/multiverse_mujoco_connector b/multiverse_ws/src/multiverse_connectors/multiverse_mujoco_connector index 81c1ab1b0..a10346134 160000 --- a/multiverse_ws/src/multiverse_connectors/multiverse_mujoco_connector +++ b/multiverse_ws/src/multiverse_connectors/multiverse_mujoco_connector @@ -1 +1 @@ -Subproject commit 81c1ab1b04d881716ac0d849c1e39a47677c8cf3 +Subproject commit a10346134814127aa71e8052eabc06334c571b19 diff --git a/multiverse_ws/src/multiverse_core/multiverse_client/CMakeLists.txt b/multiverse_ws/src/multiverse_core/multiverse_client/CMakeLists.txt index 9da545a4a..a4bd34246 100644 --- a/multiverse_ws/src/multiverse_core/multiverse_client/CMakeLists.txt +++ b/multiverse_ws/src/multiverse_core/multiverse_client/CMakeLists.txt @@ -176,8 +176,7 @@ target_link_libraries(multiverse_socket_lib # # Mark executable scripts (Python etc.) for installation # # in contrast to setup.py, you can choose the destination catkin_install_python(PROGRAMS - scripts/multiverse_publisher.py - scripts/multiverse_service.py + scripts/multiverse_socket_node.py DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} )