From cc471148912b7b61b36ec28d7e271558b389c106 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 31 Jan 2024 17:11:42 +0100
Subject: [PATCH] ups

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c24a5b96..fdee8266 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,7 +57,6 @@ will consitute of a breaking change warranting a new major release:
   calculation of rotation rate from two quaternions.
 - Fixed alignment matrix and pseudo inverses of RWs, to match the wrong definition of
   positive rotation.
->>>>>>> origin/main
 
 # [v7.5.5] 2024-01-22