Resolve conflicts

ocadotechnology · Oct 17, 2023 · 37b72f0 · 37b72f0
2 parents c35d69d + 753b893
commit 37b72f0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 <!--next-version-placeholder-->
 
+## v5.12.1 (2023-10-17)
+
+### Fix
+
+* Update level 39 hint ([#1499](https://github.com/ocadotechnology/rapid-router/issues/1499)) ([`b8a4e1f`](https://github.com/ocadotechnology/rapid-router/commit/b8a4e1f2a68fc988e7215417b789bbc190ea147c))
+
 ## v5.12.0 (2023-10-16)
 
 ### Feature

diff --git a/game/__init__.py b/game/__init__.py
@@ -1 +1 @@
-__version__ = "5.12.0"
+__version__ = "5.12.1"