docs(Changelog): Fix merge conflict issues

doc/changelog.rst

@@ -13,7 +13,6 @@ Patch releases 0.12.\*
 
 - Improvements:
 
-    -
   - A ``DataPort`` with data type ``object`` can now be connected to any other ``DataPort`` (:issue:`422`, :issue:`525`)
   - :issue:`602` Hide menu entries without function
   - Handle exceptions of the OpenGL graphical editor gracefully => do not depend on ``gtkglext``
@@ -23,6 +22,7 @@ Patch releases 0.12.\*
   - no more ``GtkWarning`` in stdout
   - `GitHub Issue #4 <https://github.com/DLR-RM/RAFCON/issues/4>`__ GTK theme does not exist
 
+
 0.12.24
 -------
 
@@ -35,17 +35,6 @@ Patch releases 0.12.\*
     - Installation of mo-files (for language support) works
 
 
-0.12.24
--------
-
-- Improvements:
-
-    - Update documenation regarding installation
-
-- Bug Fixes:
-
-    - Installation of mo-files (for language support) works
-
 0.12.23
 -------
 
@@ -59,6 +48,7 @@ Patch releases 0.12.\*
   - API: ``AttributeError`` when passing ``DeciderState`` to constructor of ``BarrierConcurrencyState``
   - Installation of mo-files (for language support) works
 
+
 0.12.22
 """""""
 
@@ -89,6 +79,7 @@ Patch releases 0.12.\*
   - :issue:`589` decider state can be deleted
   - make i18n work
 
+
 0.12.21
 """""""