Fixed merging mistake

Signed-off-by: TaikiYamada4 <[email protected]>
autowarefoundation · Nov 26, 2024 · 46a94dc · 46a94dc
1 parent 0608564
commit 46a94dc
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/...let2_map_validator/src/validators/crosswalk/regulatory_element_details_for_crosswalks.cpp b/...let2_map_validator/src/validators/crosswalk/regulatory_element_details_for_crosswalks.cpp
@@ -129,14 +129,9 @@ RegulatoryElementsDetailsForCrosswalksValidator::checkRegulatoryElementOfCrosswa
     const auto & issue_poly = lanelet::validation::Issue(
       lanelet::validation::Severity::Error, lanelet::validation::Primitive::Polygon,
       lanelet::utils::getId(),
-<<<<<<< HEAD
-      issue_code_prefix(this->name(), 8) +
-        "Crosswalk polygon of crosswalk regulatory element must have type of crosswalk_polygon.");
-=======
       append_issue_code_prefix(
         this->name(), 8,
-        "Crosswalk polygon of crosswalk regulatory element must have type of Crosswalk_polygon."));
->>>>>>> 2c9d705 (Change issue_code_prefix to append_issue_code_prefix)
+        "Crosswalk polygon of crosswalk regulatory element must have type of crosswalk_polygon."));
     lanelet::autoware::validation::checkPrimitivesType(
       crosswalk_polygons, lanelet::autoware::Crosswalk::AutowareRoleNameString::CrosswalkPolygon,
       issue_poly, issues);