Merge branch 'main' of https://github.com/dehe1011/quantum_DNA

dehe1011 · Jul 25, 2024 · 6db492e · 6db492e
2 parents 9b78a87 + 1353725
commit 6db492e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml
@@ -48,4 +48,8 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+<<<<<<< HEAD
+        uses: actions/deploy-pages@v4
+=======
+        uses: actions/deploy-pages@v4
+>>>>>>> 1353725c09ddfdec82ffd26d7c7c3c6ff81335e4