From a590313fcbb2fe3ffd67ca68032943d56387a6e9 Mon Sep 17 00:00:00 2001
From: JesusPoderoso <jesuspoderoso@eprosima.com>
Date: Wed, 13 Mar 2024 17:38:41 +0100
Subject: [PATCH] Refs #20542: Fix a couple of nitpicks

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
---
 .github/workflows/documentation-tests.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/documentation-tests.yaml b/.github/workflows/documentation-tests.yaml
index 1a659c184b7..58e12a3d01e 100644
--- a/.github/workflows/documentation-tests.yaml
+++ b/.github/workflows/documentation-tests.yaml
@@ -26,7 +26,8 @@ env:
 jobs:
   ubuntu-build-and-test-documentation:
     name: Documentation build and test
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
+    if: ${{ !(contains(github.event.pull_request.labels.*.name, 'skip-ci') ||
+              contains(github.event.pull_request.labels.*.name, 'conflicts')) }}
 
     runs-on: ubuntu-22.04
     steps:
@@ -171,4 +172,4 @@ jobs:
           print_summary: 'True'
           show_failed: 'True'
           show_disabled: 'False'
-          show_skipped: 'False'
\ No newline at end of file
+          show_skipped: 'False'