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).