From aa7c42a4e852a871abe5a3db31a75c18c85afa96 Mon Sep 17 00:00:00 2001
From: Alex Garel <alex@garel.org>
Date: Tue, 12 Dec 2023 15:00:57 +0100
Subject: [PATCH] =?UTF-8?q?ci:=C2=A0fix=20conflict?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/container-deploy.yml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/container-deploy.yml b/.github/workflows/container-deploy.yml
index 1d060532..20571da7 100644
--- a/.github/workflows/container-deploy.yml
+++ b/.github/workflows/container-deploy.yml
@@ -221,19 +221,10 @@ jobs:
             cd ${{ matrix.env }}
             docker system prune -af
 
-      - uses: frankie567/grafana-annotation-action@v1.0.3
+      - uses: basos9/grafana-annotation-action@v1.0.3
         if: ${{ always() }}
         with:
           apiHost: https://grafana.openfoodfacts.org
           apiToken: ${{ secrets.GRAFANA_API_TOKEN }}
           text: <a href="https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}">Deployment ${{ steps.livecheck.outcome }} on ${{ matrix.env }}</a>
           tags: type:deployment,origin:github,status:${{ steps.livecheck.outcome }},repo:${{ github.repository }},sha:${{ github.sha }},app:taxonomy-editor,env:${{ matrix.env }}
-=======
-    - uses: basos9/grafana-annotation-action@v1.0.3
-      if: ${{ always() }}
-      with:
-        apiHost: https://grafana.openfoodfacts.org
-        apiToken: ${{ secrets.GRAFANA_API_TOKEN }}
-        text: <a href="https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}">Deployment ${{ steps.livecheck.outcome }} on ${{ matrix.env }}</a>
-        tags: type:deployment,origin:github,status:${{ steps.livecheck.outcome }},repo:${{ github.repository }},sha:${{ github.sha }},app:taxonomy-editor,env:${{ matrix.env }}
->>>>>>> Stashed changes