From dcda5d8567cc7b612981ed69cf4807f8af0c6624 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 5 May 2025 14:18:05 +0000
Subject: [PATCH] build(deps): Bump actions/create-github-app-token from 2.0.3
 to 2.0.6 (backport #24673) (#24686)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/dependabot-update-all.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/dependabot-update-all.yml b/.github/workflows/dependabot-update-all.yml
index f63a0280d6..3b8894802c 100644
--- a/.github/workflows/dependabot-update-all.yml
+++ b/.github/workflows/dependabot-update-all.yml
@@ -14,7 +14,11 @@ jobs:
     if: ${{ github.actor == 'dependabot[bot]' }}
     steps:
       - name: Generate Token
+<<<<<<< HEAD
         uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v1
+=======
+        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v1
+>>>>>>> acb39aa52 (build(deps): Bump actions/create-github-app-token from 2.0.3 to 2.0.6 (#24673))
         id: app-token
         with:
           app-id: "${{ secrets.APP_ID }}"