From e9d7361365b578dff384ea9f3fe3bd9cbb441849 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Oct 2024 17:35:39 +0000
Subject: [PATCH] [MIRROR] Bump JamesIves/github-pages-deploy-action from 4.6.4
 to 4.6.8

---
 .github/workflows/generate_documentation.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/generate_documentation.yml b/.github/workflows/generate_documentation.yml
index 3694e551bf9ed..3cf71c320a418 100644
--- a/.github/workflows/generate_documentation.yml
+++ b/.github/workflows/generate_documentation.yml
@@ -49,7 +49,11 @@ jobs:
         run: |
           ~/dmdoc
       - name: Deploy
+<<<<<<< ours
         uses: JamesIves/github-pages-deploy-action@94f3c658273cf92fb48ef99e5fbc02bd2dc642b2
+=======
+        uses: JamesIves/github-pages-deploy-action@881db5376404c5c8d621010bcbec0310b58d5e29
+>>>>>>> theirs
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: gh-pages