Skip to content
Snippets Groups Projects
Commit 6453ad28 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'fix/changelog' into 'master' 

Remove merge leftovers in changelog

See merge request AlekSIS/official/AlekSIS-App-Chronos!193
parents a75833f1 2fb45a43
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 3 deletions
CHANGELOG.rst
+ 0
− 3
View file @ 6453ad28
......@@ -193,8 +193,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)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment