Update cruft with batchpr

Author: Cadair

.cruft.json

@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/sunpy/package-template",
-  "commit": "3d0ff5cac98c56196dbd1ba3e89703c2b7616e29",
+  "commit": "4c4701e4fe00e17a18e36e189b2928cd69983264",
   "checkout": null,
   "context": {
     "cookiecutter": {
@@ -33,7 +33,7 @@
         ".github/workflows/sub_package_update.yml"
       ],
       "_template": "https://github.com/sunpy/package-template",
-      "_commit": "3d0ff5cac98c56196dbd1ba3e89703c2b7616e29"
+      "_commit": "4c4701e4fe00e17a18e36e189b2928cd69983264"
     }
   },
   "directory": null

.github/workflows/ci.yml

@@ -155,7 +155,11 @@ jobs:
     steps:
       - uses: Cadair/matrix-notify-action@main  # zizmor: ignore[unpinned-uses]
         with:
+<<<<<<<
           workflow_description: "CI Workflow in sunpy/streamtracer"
+=======
+          workflow_description: 'CI Workflow'
+>>>>>>>
           matrix_token: ${{ secrets.MATRIX_ACCESS_TOKEN }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           homeserver: ${{ secrets.MATRIX_HOMESERVER }}

MANIFEST.in

@@ -1,6 +1,20 @@
 # Exclude specific files
+<<<<<<<
+=======
+# All files which are tracked by git and not explicitly excluded here are included by setuptools_scm
+exclude .codecov.yaml
+exclude .coveragerc
+exclude .cruft.json
+exclude .gitignore
+exclude .isort.cfg
+exclude .pre-commit-config.yaml
+exclude .readthedocs.yaml
+exclude .rtd-environment.yml
+exclude .ruff.toml
+
+>>>>>>>
 # Prune folders
+prune .github
 prune build
-prune docs/_build
-prune docs/api
+prune changelog
 global-exclude *.pyc *.o