From 63b8c52a653d2f418d17bb3d92c8b96a0f9347c6 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Thu, 23 May 2024 14:48:12 +0200
Subject: [PATCH 1/2] made sure that json-query for the mqtt monitor is
 translated properly

---
 src/pages/EditMonitor.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 0533eb0fe..3577d6333 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -370,9 +370,10 @@
                                     <label for="jsonPath" class="form-label">{{ $t("Json Query") }}</label>
                                     <input id="jsonPath" v-model="monitor.jsonPath" type="text" class="form-control" required>
 
-                                    <!-- eslint-disable-next-line vue/no-v-html -->
-                                    <div class="form-text" v-html="$t('jsonQueryDescription')">
-                                    </div>
+                                    <i18n-t tag="div" class="form-text" keypath="jsonQueryDescription">
+                                        <a href="https://jsonata.org/">jsonata.org</a>
+                                        <a href="https://try.jsonata.org/">{{ $t('here') }}</a>
+                                    </i18n-t>
                                     <br>
 
                                     <label for="expectedValue" class="form-label">{{ $t("Expected Value") }}</label>

From 359e961aa78de2cea6d79ec83ba708182804b8f8 Mon Sep 17 00:00:00 2001
From: Frank Elsinga <frank@elsinga.de>
Date: Thu, 23 May 2024 20:16:37 +0200
Subject: [PATCH 2/2] Fixed flipflopping between having
 `needs:resolve-merge-conflict` and not having `needs:resolve-merge-conflict`

---
 .github/workflows/conflict_labeler.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/conflict_labeler.yml b/.github/workflows/conflict_labeler.yml
index 10dd831aa..fdcc9c551 100644
--- a/.github/workflows/conflict_labeler.yml
+++ b/.github/workflows/conflict_labeler.yml
@@ -22,5 +22,4 @@ jobs:
         uses: eps1lon/actions-label-merge-conflict@v3
         with:
           dirtyLabel: 'needs:resolve-merge-conflict'
-          removeOnDirtyLabel: 'needs:resolve-merge-conflict'
           repoToken: '${{ secrets.GITHUB_TOKEN }}'