From 73985e298a407ecc161d65b6bf92d3fc535aa73a Mon Sep 17 00:00:00 2001
From: mtgmonkey <mtgmonkey@nixos>
Date: Mon, 8 Dec 2025 21:43:30 +0100
Subject: [PATCH] fix git

---
 CHANGELOG.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b029d3c..afb9ca7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,11 +20,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - use `Double` rather than `FLoat` for internal calculations
     - `cursorPos`, `dt` natively `Double` already
 
-<<<<<<< HEAD
+## [0.2.1] - 2025-12-08
+
+### Changed
+
+- break Git by using it wrong
+- fix Git (maybe)
+
 ## [0.2.0] - 2025-12-07
-=======
-## [0.2.0-pre0] - 2025-12-07
->>>>>>> development
 
 ### Added