Merge with master to get changes of doxygen.yml

scifir · Jul 13, 2024 · c513b59 · c513b59
2 parents 4af6873 + cc55a1a
commit c513b59
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/.github/workflows/doxygen.yml b/.github/workflows/doxygen.yml
@@ -14,7 +14,7 @@ jobs:
         --volume ${{ github.workspace }}:${{ github.workspace }}:rw
         ghcr.io/agarwalsaurav/doxygen-arch:latest
         .
-        ./Doxyfile
+        Doxyfile
         ./docs
 
     - name: Deploy to GitHub Pages
@@ -38,4 +38,8 @@ jobs:
       #    html-output-folder: ./docs
       #    branch: gh-pages
       #    target_folder: docs
-      #    git-config-email: [email protected]
+<<<<<<< HEAD
+      #    git-config-email: [email protected]
+=======
+      #    git-config-email: [email protected]
+>>>>>>> master