Commit f56fd002 authored by Fernando Herrero's avatar Fernando Herrero
Browse files

Merge branch 'master' into 'melodic_migration'

# Conflicts:
#   launch/include/map_server.launch
#   launch/nav.launch
parents 26f7df45 6b2cf41e
......@@ -17,7 +17,7 @@
<arg name="scan_topic" default="/$(arg ns)/sensors/scan"/>
<arg name="use_map" default="true"/>
<arg name="use_map_server" default="true"/>
<arg name="map_path" default="$(find iri_maps)/map"/>
<arg name="map_path" default="$(find iri_maps)/maps"/>
<arg name="map_name" default="willow"/>
<arg name="use_amcl" default="true"/>
<arg name="amcl_config" default="$(arg path)/amcl.yaml"/>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment