Merge conflict fix.

theSage21 · Jun 14, 2015 · 098c63e · 098c63e
1 parent 9e7d55a
commit 098c63e
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/ChangeLog.rst b/ChangeLog.rst
@@ -1,12 +1,3 @@
-0000.0.00
-=========
-----
-
-* Fix #31: HTML entities stay inside link
-* Fix #71: Coverage detects command line tests
-* Fix #39: Documentation update
-* Fix #61: Functionality added for optional use of automatic links
-
 2015.4.14
 =========
 ----
@@ -110,3 +101,13 @@
 
 * Fix #1: Add ``ChangeLog.rst`` file.
 * Fix #2: Add ``AUTHORS.rst`` file.
+
+0000.0.00
+=========
+----
+
+* Fix #31: HTML entities stay inside link
+* Fix #71: Coverage detects command line tests
+* Fix #39: Documentation update
+* Fix #61: Functionality added for optional use of automatic links
+