Skip to content

Commit 56443e8

Browse files
committed
fix conflict
1 parent fb6f47c commit 56443e8

File tree

6 files changed

+332
-235
lines changed

6 files changed

+332
-235
lines changed

perception/autoware_traffic_light_visualization/src/traffic_light_roi_visualizer/shape_draw.cpp

-180
This file was deleted.

perception/autoware_traffic_light_visualization/src/traffic_light_roi_visualizer/shape_draw.hpp

-55
This file was deleted.

perception/traffic_light_visualization/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ find_package(OpenCV REQUIRED)
88

99
ament_auto_add_library(traffic_light_roi_visualizer_nodelet SHARED
1010
src/traffic_light_roi_visualizer/nodelet.cpp
11+
src/traffic_light_roi_visualizer/shape_draw.cpp
1112
)
1213

1314
target_link_libraries(traffic_light_roi_visualizer_nodelet

0 commit comments

Comments
 (0)