Remove references to non-existing files and cleanup

moveit · Aug 10, 2023 · ee8f255 · ee8f255
1 parent 2b6e3b9
commit ee8f255
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git 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
@@ -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