@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/sunpy/package-template",
-  "commit": "febd45b05a8eb80d6171683bf54fbe764a0c9063",
+  "commit": "5c98b2c9fc7ea81ebdcbae21a76e52e3c959dc77",
   "checkout": null,
   "context": {
     "cookiecutter": {
@@ -33,7 +33,7 @@
         ".github/workflows/sub_package_update.yml"
       ],
       "_template": "https://github.com/sunpy/package-template",
-      "_commit": "febd45b05a8eb80d6171683bf54fbe764a0c9063"
+      "_commit": "5c98b2c9fc7ea81ebdcbae21a76e52e3c959dc77"
     }
   },
   "directory": null
 
@@ -37,6 +37,14 @@ pass_env =
     LOCALE_ARCHIVE
     # If the user has set a LC override we should follow it
     LC_ALL
+<<<<<<<
+=======
+setenv =
+    COVERAGE_FILE={toxinidir}/.coverage
+    MPLBACKEND = agg
+    devdeps: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/astropy/simple https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
+deps =
+>>>>>>>
     # Needed for building Rust-based dependencies
     RUSTUP_TOOLCHAIN
 setenv =