merge branch 'feature/migrate-to-rst' of github.com:ciesin-geospatial…

…/TOPSTSCHOOL-OSDMP into feature/migrate-to-rst
ciesin-geospatial · Sep 6, 2024 · 2d78621 · 2d78621
2 parents fd8bae3 + 101b838
commit 2d78621
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/publish-dev-pages.yaml b/.github/workflows/publish-dev-pages.yaml
@@ -76,11 +76,7 @@ jobs:
       # Step 5: Deploy the built HTML files to the specified branch (GitHub Pages).
       - name: DEV | Deploy to GitHub Pages
         uses: peaceiris/actions-gh-pages@v4
-<<<<<<< HEAD
         if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/dev' }}
-=======
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
->>>>>>> f3d3c6794de790efb33951b3700874ed9d3e1a2f
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}  # Deploys to the gh-pages branch.
           publish_branch: ${{ env.PUBLISH_BRANCH }}  # Uses the GitHub token for authentication.