From d4d47221df2071b781e68a59e835cbd525917874 Mon Sep 17 00:00:00 2001
From: Takayuki Murooka <takayuki5168@gmail.com>
Date: Mon, 9 Oct 2023 01:43:15 +0900
Subject: [PATCH] fix: fixed conflict

Signed-off-by: Takayuki Murooka <takayuki5168@gmail.com>
---
 planning/behavior_velocity_intersection_module/src/util.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/planning/behavior_velocity_intersection_module/src/util.cpp b/planning/behavior_velocity_intersection_module/src/util.cpp
index cc30f21a1eca5..722bf696ef55b 100644
--- 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
 {