fixing merge conflicts
Showing
- README.md 10 additions, 8 deletionsREADME.md
- nav2_bringup/bringup/launch/nav2_bringup_launch.py 2 additions, 9 deletionsnav2_bringup/bringup/launch/nav2_bringup_launch.py
- nav2_bringup/bringup/launch/nav2_localization_launch.py 2 additions, 7 deletionsnav2_bringup/bringup/launch/nav2_localization_launch.py
- nav2_bringup/bringup/launch/nav2_multi_tb3_simulation_launch.py 0 additions, 1 deletion...ringup/bringup/launch/nav2_multi_tb3_simulation_launch.py
- nav2_bringup/bringup/launch/nav2_navigation_launch.py 4 additions, 11 deletionsnav2_bringup/bringup/launch/nav2_navigation_launch.py
- nav2_bringup/bringup/launch/nav2_rviz_launch.py 2 additions, 3 deletionsnav2_bringup/bringup/launch/nav2_rviz_launch.py
- nav2_bringup/bringup/launch/nav2_tb3_simulation_launch.py 2 additions, 12 deletionsnav2_bringup/bringup/launch/nav2_tb3_simulation_launch.py
- nav2_bringup/nav2_gazebo_spawner/nav2_gazebo_spawner/nav2_gazebo_spawner.py 1 addition, 1 deletion...gazebo_spawner/nav2_gazebo_spawner/nav2_gazebo_spawner.py
- nav2_common/nav2_common/launch/__init__.py 0 additions, 1 deletionnav2_common/nav2_common/launch/__init__.py
- nav2_common/nav2_common/launch/node.py 0 additions, 385 deletionsnav2_common/nav2_common/launch/node.py
- nav2_controller/src/progress_checker.cpp 1 addition, 1 deletionnav2_controller/src/progress_checker.cpp
- nav2_costmap_2d/CMakeLists.txt 1 addition, 1 deletionnav2_costmap_2d/CMakeLists.txt
- nav2_dwb_controller/dwb_critics/CMakeLists.txt 1 addition, 1 deletionnav2_dwb_controller/dwb_critics/CMakeLists.txt
- nav2_dwb_controller/dwb_plugins/CMakeLists.txt 1 addition, 1 deletionnav2_dwb_controller/dwb_plugins/CMakeLists.txt
- nav2_lifecycle_manager/include/nav2_lifecycle_manager/lifecycle_manager.hpp 1 addition, 1 deletion...ager/include/nav2_lifecycle_manager/lifecycle_manager.hpp
- nav2_lifecycle_manager/src/lifecycle_manager.cpp 9 additions, 8 deletionsnav2_lifecycle_manager/src/lifecycle_manager.cpp
- nav2_navfn_planner/CMakeLists.txt 1 addition, 1 deletionnav2_navfn_planner/CMakeLists.txt
- nav2_recoveries/CMakeLists.txt 1 addition, 1 deletionnav2_recoveries/CMakeLists.txt
- nav2_system_tests/README.md 3 additions, 0 deletionsnav2_system_tests/README.md
- nav2_system_tests/src/updown/README.md 22 additions, 0 deletionsnav2_system_tests/src/updown/README.md
Please register or sign in to comment