From 92570c89fc6912af613a109f1c55b2a724142e97 Mon Sep 17 00:00:00 2001 From: kminoda Date: Thu, 23 Jun 2022 18:31:51 +0900 Subject: [PATCH 1/2] resolve conflict Signed-off-by: kminoda --- .../launch/twist_estimator/twist_estimator.launch.xml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/localization_launch/launch/twist_estimator/twist_estimator.launch.xml b/localization_launch/launch/twist_estimator/twist_estimator.launch.xml index fd7854a7e..155521a0e 100644 --- a/localization_launch/launch/twist_estimator/twist_estimator.launch.xml +++ b/localization_launch/launch/twist_estimator/twist_estimator.launch.xml @@ -1,12 +1,8 @@ - - - - - - - + + + From 19c37ab43c75e3d88695b6602e103ca462e9a86b Mon Sep 17 00:00:00 2001 From: kminoda Date: Tue, 28 Jun 2022 15:24:44 +0900 Subject: [PATCH 2/2] update readme Signed-off-by: kminoda --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b1ff82b20..b22428a81 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # autoware_launcher -## Getting Started +## Getting started ### Using real vehicle @@ -14,7 +14,7 @@ ros2 launch autoware_launch autoware.launch.xml map_path:=/path/to/map_folder ve ros2 launch autoware_launch planning_simulator.launch.xml map_path:=/path/to/map_folder vehicle_model:=[vehicle_name] sensor_model:=[sensor_name] ``` -## Directory Structure +## Directory structure - [autoware_launch](./autoware_launch) - [control_launch](./control_launch)