Update python-publish.yml

legopitstop · May 7, 2024 · 07b50f4 · 07b50f4
1 parent f41e57a
commit 07b50f4
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -42,8 +42,4 @@ jobs:
       uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
       with:
         user: __token__
-<<<<<<< HEAD
         password: ${{ secrets.PYPI_API_TOKEN }}
-=======
-        password: ${{ secrets.PYPI_API_TOKEN }}
->>>>>>> b2c57d7400cb9776f7d8075e21ce07265a1badfd