From 2fb45a432854fbcfafaf992db050b1b2cb249889 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Sun, 1 Aug 2021 14:26:37 +0200
Subject: [PATCH] Remove merge leftovers in changelog

---
 CHANGELOG.rst | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index baf42bfa..853a0fc1 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -185,8 +185,5 @@ Fixed
 .. _2.0b0: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b0
 .. _2.0b1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b1
 .. _2.0b2: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b2
-<<<<<<< HEAD
-=======
 .. _2.0b3: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b3
 .. _2.0rc1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0rc1
->>>>>>> e039025 (Update the changelog for 2.0rc1)
-- 
GitLab