solving merge conflict

Author: LAShemilt

.github/workflows/publish-docs.yml

@@ -3,15 +3,23 @@ name: Deploy docs
 on:  # yamllint disable-line rule:truthy
   push:
     branches:
+<<<<<<< HEAD
       - main
+=======
+      - master
+>>>>>>> refs/remotes/origin/docs-ci
     tags:
       - v*
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+<<<<<<< HEAD
       - uses: SciCatProject/docs-template/.github/actions/mkdocs-pages@main
+=======
+      - uses: SciCatProject/docs-template/.github/actions/[email protected]
+>>>>>>> refs/remotes/origin/docs-ci
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           push: true