From 6e16c66e0b22e4776532baa9c23d31ea248591c2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 4 Jul 2024 22:21:28 +0000
Subject: [PATCH] =?UTF-8?q?bump:=20version=200.15.1=20=E2=86=92=200.15.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md   | 6 ++++++
 pyproject.toml | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0ef413..a61b0c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v0.15.2 (2024-07-04)
+
+### Fix
+
+- merge conflict
+
 ## v0.15.1 (2024-06-29)
 
 ### Refactor
diff --git a/pyproject.toml b/pyproject.toml
index b0392ce..53f93ee 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hypysagas"
-version = "0.15.1"
+version = "0.15.2"
 authors = [
   { name="Kieran Mackle", email="kemackle98@gmail.com" },
 ]
@@ -43,7 +43,7 @@ dev = [
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.15.1"
+version = "0.15.2"
 tag_format = "v$version"
 version_provider = "pep621"
 version_files = [