[MIRROR] Bump JamesIves/github-pages-deploy-action from 4.6.4 to 4.6.8

SierraBay · Oct 3, 2024 · e9d7361 · e9d7361
1 parent bde3a3e
commit e9d7361
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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