From 9290914e6180584cddfde106c2b770ea77ed2f3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Mon, 29 Apr 2024 17:35:38 +0200 Subject: [PATCH] Rename migration notes file (#300) * Rename file * Rename file (cherry picked from commit d0bf5bd902d894e88cc9f1786c619a0db96b48f6) # Conflicts: # doc/migration/migration.rst --- doc/migration/migration.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/migration/migration.rst b/doc/migration/migration.rst index 84cc0814fe0..d535f582e20 100644 --- 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