chore(behavior_velocity): resolve conflict

Signed-off-by: tanaka3 <ttatcoder@outlook.jp>
autowarefoundation · Mar 15, 2022 · aba7dee · aba7dee
1 parent 7f0bb83
commit aba7dee
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/planning/behavior_velocity_planner/include/utilization/util.hpp b/planning/behavior_velocity_planner/include/utilization/util.hpp
@@ -130,7 +130,7 @@ void createDetectionAreaPolygons(
 
 Point2d calculateLateralOffsetPoint2d(const Pose & p, const double offset);
 
-void getAllPartitionLanelets(const lanelet::LaneletMapConstPtr ll, Polygons2d & polys);
+void getAllPartitionLanelets(const lanelet::LaneletMapConstPtr ll, BasicPolygons2d & polys);
 void setVelocityFrom(const size_t idx, const double vel, PathWithLaneId * input);
 void insertVelocity(
   PathWithLaneId & path, const PathPointWithLaneId & path_point, const double v,