Merging changes into main from release_staging_v0.6.2.

cellml · Oct 29, 2024 · 8d0f7cc · 8d0f7cc
2 parents 5e4f3ee + c7da019
commit 8d0f7cc
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/docs/changelogs/changelog_v0.6.2.rst b/docs/changelogs/changelog_v0.6.2.rst
@@ -0,0 +1,15 @@
+libCellML v0.6.2 Changelog
+==========================
+
+Infrastructure
+--------------
+
+* Fix publishing of PyPI wheels by `@hsorby <https://github.com/hsorby>`_ [`#1284 <https://github.com/cellml/libcellml/pull/1284>`_].
+
+Contributors
+------------
+
+.. image:: https://avatars.githubusercontent.com/u/778048?v=4
+   :target: https://github.com/hsorby
+   :height: 32
+   :width: 32
diff --git a/docs/changelogs/index.rst b/docs/changelogs/index.rst
@@ -4,7 +4,12 @@ Changelogs
 
 .. toctree::
 
+<<<<<<< HEAD
    changelog_v0.6.1
+=======
+   changelog_v0.6.2
+   changelog_v0.6.1-rc.3
+>>>>>>> release_staging_v0.6.2
    changelog_v0.6.0
    changelog_v0.5.0
    changelog_v0.4.0

diff --git a/docs/index.rst b/docs/index.rst
@@ -39,7 +39,12 @@ Changelogs
 
 .. toctree::
 
+<<<<<<< HEAD
    changelogs/changelog_v0.6.1
+=======
+   changelogs/changelog_v0.6.2
+   changelogs/changelog_v0.6.1-rc.3
+>>>>>>> release_staging_v0.6.2
    changelogs/changelog_v0.6.0
    changelogs/changelog_v0.5.0
    changelogs/changelog_v0.4.0