From b3cdb05214f398fd35577261d7ae6833c41c430b Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Fri, 17 Feb 2023 16:10:56 +0100
Subject: [PATCH] changelg update

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d52487e..7c77a8b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -154,7 +154,6 @@ eive-tmtc: v2.12.2
 
 - First version of a TCS controller heater control loop, but
   the loop is disabled for now.
->>>>>>> origin/develop
 
 ## Changed