Rename migration notes file (#300)

* Rename file * Rename file (cherry picked from commit d0bf5bd) # Conflicts: # doc/migration/migration.rst
ros-controls · Apr 29, 2024 · 9290914 · 9290914
1 parent 683a80c
commit 9290914
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/doc/migration/migration.rst b/doc/migration/migration.rst
@@ -21,7 +21,12 @@ 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