fix: revert unintended changes

dstl · Nov 16, 2024 · f788491 · f788491
1 parent cc3e5b2
commit f788491
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 235 deletions.
diff --git a/.github/workflows/docs-link.yml b/.github/workflows/docs-link.yml
@@ -13,11 +13,7 @@ jobs:
     name: Run CircleCI artifacts redirector
     steps:
       - name: GitHub Action step
-<<<<<<< HEAD
         uses: scientific-python/circleci-artifacts-redirector-action@v1
-=======
-        uses: larsoner/circleci-artifacts-redirector-action@v1
->>>>>>> main
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           api-token: ${{ secrets.CIRCLECI_DOCS_LINK }}

diff --git a/docs/tutorials/.ipynb_checkpoints/10_Simulation_&_Tracking_Components-checkpoint.py b/docs/tutorials/.ipynb_checkpoints/10_Simulation_&_Tracking_Components-checkpoint.py