Update ci.yml

.github/workflows/ci.yml

@@ -1,7 +1,4 @@
-<<<<<<<
-=======
 # Main CI Workflow
->>>>>>>
 name: CI
 
 on:
@@ -48,15 +45,9 @@ jobs:
       - run: python -m pip install -U --user twine
       - run: python -m twine check dist/*
 
-<<<<<<<
   docs:
-    needs: [core]
-    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main
-=======
-  test:
     needs: [core, sdist_verify]
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
->>>>>>>
     with:
       default_python: '3.12'
       submodules: false
@@ -68,15 +59,6 @@ jobs:
       envs: |
         - linux: build_docs
 
-<<<<<<<
-=======
-  docs:
-    needs: [core]
-    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
-    with:
-      default_python: '3.12'
-      submodules: false
->>>>>>>
   publish:
     # Build wheels on PRs only when labelled. Releases will only be published if tagged ^v.*
     # see https://github-actions-workflows.openastronomy.org/en/latest/publish.html#upload-to-pypi
@@ -86,22 +68,8 @@ jobs:
         github.event_name == 'pull_request' &&
         contains(github.event.pull_request.labels.*.name, 'Run publish')
       )
-<<<<<<<
-=======
-    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
-    with:
-      default_python: '3.12'
-      submodules: false
->>>>>>>
     needs: [sdist_verify, docs]
-<<<<<<<
-    uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@main
-=======
-        contains(github.event.pull_request.labels.*.name, 'Run publish')
-      )
-    needs: [test, docs]
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v1
->>>>>>>
     with:
       python-version: '3.12'
       test_extras: 'tests'