Update migration.rst

ros-controls · Apr 29, 2024 · 08cecf4 · 08cecf4
1 parent 1c81e50
commit 08cecf4
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/doc/migration/migration.rst b/doc/migration/migration.rst
@@ -21,12 +21,7 @@ ros2_control
 .. toctree::
    :titlesonly:
 
-<<<<<<< HEAD
-   Foxy to Galactic <../ros2_control/doc/migration/Foxy.rst>
-=======
    Foxy to Galactic <../ros2_control/doc/migration/Galactic.rst>
-   Iron to Jazzy <../ros2_control/doc/migration/Jazzy.rst>
->>>>>>> d0bf5bd (Rename migration notes file  (#300))
 
 
 ros2_controllers