From 494ac06c151c2fdfdfaba81641913263d18ae337 Mon Sep 17 00:00:00 2001 From: Florian Vahl <7vahl@informatik.uni-hamburg.de> Date: Sun, 8 Dec 2024 11:02:18 +0100 Subject: [PATCH 1/2] Fix CI badges in README.md Signed-off-by: Florian Vahl <7vahl@informatik.uni-hamburg.de> (cherry picked from commit 9b0f86efee59f62eae14276bf8b031208fda7f17) # Conflicts: # README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 8acf910..40e903b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,13 @@ # RQT Image Overlay +<<<<<<< HEAD [![Build and Test (galactic)](https://github.com/ros-sports/rqt_image_overlay/actions/workflows/build_and_test_galactic.yaml/badge.svg?branch=galactic)](https://github.com/ros-sports/rqt_image_overlay/actions/workflows/build_and_test_galactic.yaml?query=branch:galactic) [![Build and Test (humble)](https://github.com/ros-sports/rqt_image_overlay/actions/workflows/build_and_test_humble.yaml/badge.svg?branch=humble)](https://github.com/ros-sports/rqt_image_overlay/actions/workflows/build_and_test_humble.yaml?query=branch:humble) [![Build and Test (rolling)](https://github.com/ros-sports/rqt_image_overlay/actions/workflows/build_and_test_rolling.yaml/badge.svg?branch=rolling)](https://github.com/ros-sports/rqt_image_overlay/actions/workflows/build_and_test_rolling.yaml?query=branch:rolling) +======= +[![Build and Test (humble)](../../actions/workflows/build_and_test_humble.yaml/badge.svg?branch=humble)](../../actions/workflows/build_and_test_humble.yaml?query=branch:humble) +[![Build and Test (jazzy)](../../actions/workflows/build_and_test_jazzy.yaml/badge.svg?branch=jazzy)](../../actions/workflows/build_and_test_jazzy.yaml?query=branch:jazzy) +[![Build and Test (rolling)](../../actions/workflows/build_and_test_rolling.yaml/badge.svg?branch=rolling)](../../actions/workflows/build_and_test_rolling.yaml?query=branch:rolling) +>>>>>>> 9b0f86e (Fix CI badges in README.md) For more information, see our [Documentation](https://rqt-image-overlay.readthedocs.io/en/latest/index.html). From b6744eb87b134e01d72d8a7d961a4eb08706179b Mon Sep 17 00:00:00 2001 From: ijnek Date: Sun, 8 Dec 2024 22:30:50 +0000 Subject: [PATCH 2/2] fix conflict Signed-off-by: ijnek --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index 40e903b..a8dfa77 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,7 @@ # RQT Image Overlay -<<<<<<< HEAD -[![Build and Test (galactic)](https://github.com/ros-sports/rqt_image_overlay/actions/workflows/build_and_test_galactic.yaml/badge.svg?branch=galactic)](https://github.com/ros-sports/rqt_image_overlay/actions/workflows/build_and_test_galactic.yaml?query=branch:galactic) -[![Build and Test (humble)](https://github.com/ros-sports/rqt_image_overlay/actions/workflows/build_and_test_humble.yaml/badge.svg?branch=humble)](https://github.com/ros-sports/rqt_image_overlay/actions/workflows/build_and_test_humble.yaml?query=branch:humble) -[![Build and Test (rolling)](https://github.com/ros-sports/rqt_image_overlay/actions/workflows/build_and_test_rolling.yaml/badge.svg?branch=rolling)](https://github.com/ros-sports/rqt_image_overlay/actions/workflows/build_and_test_rolling.yaml?query=branch:rolling) -======= [![Build and Test (humble)](../../actions/workflows/build_and_test_humble.yaml/badge.svg?branch=humble)](../../actions/workflows/build_and_test_humble.yaml?query=branch:humble) [![Build and Test (jazzy)](../../actions/workflows/build_and_test_jazzy.yaml/badge.svg?branch=jazzy)](../../actions/workflows/build_and_test_jazzy.yaml?query=branch:jazzy) [![Build and Test (rolling)](../../actions/workflows/build_and_test_rolling.yaml/badge.svg?branch=rolling)](../../actions/workflows/build_and_test_rolling.yaml?query=branch:rolling) ->>>>>>> 9b0f86e (Fix CI badges in README.md) For more information, see our [Documentation](https://rqt-image-overlay.readthedocs.io/en/latest/index.html).