From dfee0939485132ec3b0e63b3e13b58fe27e08de2 Mon Sep 17 00:00:00 2001 From: Cadair <1391051+Cadair@users.noreply.github.com> Date: Mon, 30 Mar 2026 07:32:14 +0000 Subject: [PATCH 1/2] Automatic package template update --- .cruft.json | 4 ++-- README.rst | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.cruft.json b/.cruft.json index c1daec3..0c0ce3c 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/sunpy/package-template", - "commit": "9599f755e4f7880fe20f0f07bbf500d8c41de34d", + "commit": "6436220cebd96b3638682023e7149eb78e012fdc", "checkout": null, "context": { "cookiecutter": { @@ -33,7 +33,7 @@ ".github/workflows/sub_package_update.yml" ], "_template": "https://github.com/sunpy/package-template", - "_commit": "9599f755e4f7880fe20f0f07bbf500d8c41de34d" + "_commit": "6436220cebd96b3638682023e7149eb78e012fdc" } }, "directory": null diff --git a/README.rst b/README.rst index b0d8da5..41dd418 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,12 @@ +<<<<<<< streamtracer ============ +======= +``streamtracer`` +================ + +Python library to calculate streamlines +>>>>>>> Fast streamline tracing in python From 36e6f4e093a9780341bc2724c4af0ed53cb379df Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Mon, 30 Mar 2026 08:30:11 +0000 Subject: [PATCH 2/2] Update README.rst --- README.rst | 7 ------- 1 file changed, 7 deletions(-) diff --git a/README.rst b/README.rst index 41dd418..7858124 100644 --- a/README.rst +++ b/README.rst @@ -1,14 +1,7 @@ -<<<<<<< -streamtracer -============ -======= ``streamtracer`` ================ Python library to calculate streamlines ->>>>>>> - -Fast streamline tracing in python |Documentation Status| |Build Status| |codecov|