fix conflict

saka1-s · Nov 1, 2024 · 56443e8 · 56443e8
1 parent fb6f47c
commit 56443e8
Show file tree

Hide file tree

Showing 6 changed files with 332 additions and 235 deletions.
diff --git a/...tion/autoware_traffic_light_visualization/src/traffic_light_roi_visualizer/shape_draw.cpp b/...tion/autoware_traffic_light_visualization/src/traffic_light_roi_visualizer/shape_draw.cpp
diff --git a/...tion/autoware_traffic_light_visualization/src/traffic_light_roi_visualizer/shape_draw.hpp b/...tion/autoware_traffic_light_visualization/src/traffic_light_roi_visualizer/shape_draw.hpp
diff --git a/perception/traffic_light_visualization/CMakeLists.txt b/perception/traffic_light_visualization/CMakeLists.txt
@@ -8,6 +8,7 @@ find_package(OpenCV REQUIRED)
 
 ament_auto_add_library(traffic_light_roi_visualizer_nodelet SHARED
   src/traffic_light_roi_visualizer/nodelet.cpp
+  src/traffic_light_roi_visualizer/shape_draw.cpp
 )
 
 target_link_libraries(traffic_light_roi_visualizer_nodelet