fix: fixed conflict

Signed-off-by: Takayuki Murooka <[email protected]>
tier4 · Oct 8, 2023 · d4d4722 · d4d4722
1 parent 98150dd
commit d4d4722
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/planning/behavior_velocity_intersection_module/src/util.cpp b/planning/behavior_velocity_intersection_module/src/util.cpp
@@ -41,7 +41,6 @@
 #include <unordered_map>
 #include <vector>
 
-/*
 namespace tier4_autoware_utils
 {
 
@@ -56,7 +55,6 @@ inline geometry_msgs::msg::Point getPoint(const lanelet::ConstPoint3d & p)
 }
 
 }  // namespace tier4_autoware_utils
-*/
 
 namespace behavior_velocity_planner
 {