Update docs.yml

Fix hanging merge conflict
andykee · Nov 29, 2023 · 790d02e · 790d02e
1 parent ec111ea
commit 790d02e
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -45,11 +45,7 @@ jobs:
         uses: actions/upload-pages-artifact@v2
         with:
           # Upload entire repository
-<<<<<<< HEAD
           path: 'docs/_build/html'
-=======
-          path: '_build/html'
->>>>>>> docs
       - name: Deploy to GitHub Pages
         id: deployment
         uses: actions/deploy-pages@v2