fix: conflict

Signed-off-by: tzhong518 <[email protected]>
autowarefoundation · Dec 6, 2024 · cd04a31 · cd04a31
2 parents 5791db0 + 200573c
commit cd04a31
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/perception/autoware_crosswalk_traffic_light_estimator/README.md b/perception/autoware_crosswalk_traffic_light_estimator/README.md
@@ -8,11 +8,19 @@
 
 ### Input
 
+<<<<<<< HEAD
 | Name                                 | Type                                             | Description        |
 | ------------------------------------ | ------------------------------------------------ | ------------------ |
 | `~/input/vector_map`                 | `autoware_map_msgs::msg::LaneletMapBin`          | vector map         |
 | `~/input/route`                      | `autoware_planning_msgs::msg::LaneletRoute`      | route (optional)   |
 | `~/input/classified/traffic_lights`  | `autoware_perception_msgs::msg::TrafficLightGroupArray` | classified signals |
+=======
+| Name                                | Type                                                    | Description        |
+| ----------------------------------- | ------------------------------------------------------- | ------------------ |
+| `~/input/vector_map`                | `autoware_map_msgs::msg::LaneletMapBin`                 | vector map         |
+| `~/input/route`                     | `autoware_planning_msgs::msg::LaneletRoute`             | route (optional)   |
+| `~/input/classified/traffic_lights` | `autoware_perception_msgs::msg::TrafficLightGroupArray` | classified signals |
+>>>>>>> 200573ce766fc67663ffc721632f6520d392a775
 
 ### Output