From 3df4ed71bc314ede631061752304792761f9973d Mon Sep 17 00:00:00 2001
From: nabobalis <1392107+nabobalis@users.noreply.github.com>
Date: Mon, 5 May 2025 07:03:06 +0000
Subject: [PATCH 1/2] Automatic package template update

---
 .cruft.json             | 4 ++--
 .pre-commit-config.yaml | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.cruft.json b/.cruft.json
index 0f297092..e106ed08 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/sunpy/package-template",
-  "commit": "75bb72f38a9b527937b6a135457418c00b8614a9",
+  "commit": "57a6cb05ebbddf3f2aae7b97c86705f746303f4e",
   "checkout": null,
   "context": {
     "cookiecutter": {
@@ -32,7 +32,7 @@
         ".github/workflows/sub_package_update.yml"
       ],
       "_template": "https://github.com/sunpy/package-template",
-      "_commit": "75bb72f38a9b527937b6a135457418c00b8614a9"
+      "_commit": "57a6cb05ebbddf3f2aae7b97c86705f746303f4e"
     }
   },
   "directory": null
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7e03005a..0d4128da 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,11 @@
 repos:
     # This should be before any formatting hooks like isort
   - repo: https://github.com/astral-sh/ruff-pre-commit
+<<<<<<<
     rev: "v0.11.4"
+=======
+    rev: "v0.11.7"
+>>>>>>>
     hooks:
       - id: ruff
         args: ["--fix"]

From 9b0c79b44ae67ceee4f34b0c157d9d2e5d6c0224 Mon Sep 17 00:00:00 2001
From: Nabil Freij <nabil.freij@gmail.com>
Date: Mon, 5 May 2025 08:36:37 -0700
Subject: [PATCH 2/2] Update .pre-commit-config.yaml

---
 .pre-commit-config.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0d4128da..1964dfa7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,11 +1,7 @@
 repos:
     # This should be before any formatting hooks like isort
   - repo: https://github.com/astral-sh/ruff-pre-commit
-<<<<<<<
-    rev: "v0.11.4"
-=======
     rev: "v0.11.7"
->>>>>>>
     hooks:
       - id: ruff
         args: ["--fix"]