Resolve conflicts

This commit is contained in:
Kevo 2022-02-26 11:42:52 +01:00
commit a4e6b21524
3 changed files with 3 additions and 3 deletions

View file

@ -35,4 +35,4 @@ jobs:
uses: JamesIves/github-pages-deploy-action@4.1.4 uses: JamesIves/github-pages-deploy-action@4.1.4
with: with:
branch: documentation branch: documentation
folder: ./documentation folder: ./documentation

View file

@ -38,4 +38,4 @@ jobs:
uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29 uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
with: with:
user: __token__ user: __token__
password: ${{ secrets.PYPI_API_TOKEN }} password: ${{ secrets.PYPI_API_TOKEN }}

View file

@ -25,4 +25,4 @@ jobs:
- name: Test with pyTest - name: Test with pyTest
run: | run: |
python -m pytest -v python -m pytest -v