Update jekyll-gh-pages.yml

ut-ras · May 15, 2024 · 132c345 · 132c345
1 parent 89aea57
commit 132c345
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml
@@ -1,14 +1,5 @@
 # Sample workflow for building and deploying a Jekyll site to GitHub Pages
-<<<<<<< Updated upstream
-name: Deploy Jekyll site to Pages
-
-defaults:
-  run:
-    # Specifies where all site materials are located for the job
-    working-directory: ./docs
-=======
 name: Deploy Jekyll with GitHub Pages dependencies preinstalled
->>>>>>> Stashed changes
 
 on:
   # Runs on pushes targeting the default branch