From ee8f25573a355405b1e2442c13ade052860af5ef Mon Sep 17 00:00:00 2001 From: Sebastian Jahr Date: Thu, 10 Aug 2023 09:23:12 +0200 Subject: [PATCH] Remove references to non-existing files and cleanup --- doc/examples/examples.rst | 1 - doc/how_to_guides/how_to_guides.rst | 4 ---- 2 files changed, 5 deletions(-) diff --git a/doc/examples/examples.rst b/doc/examples/examples.rst index 6a7bc08b23..3745a127c9 100644 --- a/doc/examples/examples.rst +++ b/doc/examples/examples.rst @@ -64,7 +64,6 @@ Configuration custom_constraint_samplers/custom_constraint_samplers_tutorial ompl_interface/ompl_interface_tutorial stomp_planner/stomp_planner_tutorial - chomp_planner/chomp_planner_tutorial stomp_planner/stomp_planner_tutorial trajopt_planner/trajopt_planner_tutorial pilz_industrial_motion_planner/pilz_industrial_motion_planner diff --git a/doc/how_to_guides/how_to_guides.rst b/doc/how_to_guides/how_to_guides.rst index 8596700950..ef6388bb79 100644 --- a/doc/how_to_guides/how_to_guides.rst +++ b/doc/how_to_guides/how_to_guides.rst @@ -3,8 +3,6 @@ How-To Guides These how-to guides will help you quickly solve specific problems using MoveIt. -<<<<<<< HEAD -======= For more information, refer to :doc:`/doc/how_to_guides/how_to_guide`. Configuring and Using MoveIt @@ -16,7 +14,6 @@ Configuring and Using MoveIt kinematics_cost_function/kinematics_cost_function_tutorial moveit_configuration/moveit_configuration_tutorial pilz_industrial_motion_planner/pilz_industrial_motion_planner - stomp_planner/stomp_planner chomp_planner/chomp_planner_tutorial using_ompl_constrained_planning/ompl_constrained_planning parallel_planning/parallel_planning_tutorial @@ -28,7 +25,6 @@ Configuring and Using MoveIt Developing and Documenting MoveIt --------------------------------- ->>>>>>> 725c7d8 (Migrate CHOMP and collision tutorials from ROS1 (#492)) .. toctree:: :maxdepth: 1