From 9cd3d90e1ceb07b3a00cbda2f97a10452a303e04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Behmo?= <regis@behmo.com>
Date: Tue, 28 Feb 2023 09:46:33 +0100
Subject: [PATCH] v15.3.1

---
 CHANGELOG.md                                        |  5 +++++
 changelog.d/20230214_105510_keith_fix_jobs_merge.md | 12 ------------
 tutor/__about__.py                                  |  2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 100644 changelog.d/20230214_105510_keith_fix_jobs_merge.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea2d1a1..69c42e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,11 @@ instructions, because git commits are used to generate release notes:
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-15.3.1'></a>
+## v15.3.1 (2023-02-28)
+
+- [Bugfix] `patchStrategicMerge` can now be applied to jobs. (by @keithgg)
+
 <a id='changelog-15.3.0'></a>
 ## v15.3.0 (2023-02-10)
 
diff --git a/changelog.d/20230214_105510_keith_fix_jobs_merge.md b/changelog.d/20230214_105510_keith_fix_jobs_merge.md
deleted file mode 100644
index 4bd44fd..0000000
--- a/changelog.d/20230214_105510_keith_fix_jobs_merge.md
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--
-Create a changelog entry for every new user-facing change. Please respect the following instructions:
-- Indicate breaking changes by prepending an explosion 💥 character.
-- Prefix your changes with either [Bugfix], [Improvement], [Feature], [Security], [Deprecation].
-- You may optionally append "(by @<author>)" at the end of the line, where "<author>" is either one (just one)
-  of your GitHub username, real name or affiliated organization. These affiliations will be displayed in
-  the release notes for every release.
--->
-
-<!-- - 💥[Feature] Foobarize the blorginator. This breaks plugins by renaming the `FOO_DO` filter to `BAR_DO`. (by @regisb) -->
-<!-- - [Improvement] This is a non-breaking change. Life is good. (by @billgates) -->
-[Bugfix] `patchStrategicMerge` can now be applied to jobs (by @keithgg)
diff --git a/tutor/__about__.py b/tutor/__about__.py
index 68dde74..29260aa 100644
--- a/tutor/__about__.py
+++ b/tutor/__about__.py
@@ -2,7 +2,7 @@ import os
 
 # Increment this version number to trigger a new release. See
 # docs/tutor.html#versioning for information on the versioning scheme.
-__version__ = "15.3.0"
+__version__ = "15.3.1"
 
 # The version suffix will be appended to the actual version, separated by a
 # dash. Use this suffix to differentiate between the actual released version and