📝 changelog

OCR-D · Aug 21, 2019 · 5fd2875 · 5fd2875
1 parent c9031e8
commit 5fd2875
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -556,12 +556,11 @@ Fixed
 Initial Release
 
 <!-- link-labels -->
-<<<<<<< HEAD
-=======
+[1.0.0b17]: ../../compare/v1.0.0b17...v1.0.0b16
+[1.0.0b16]: ../../compare/v1.0.0b16...v1.0.0b15
 [1.0.0b15]: ../../compare/v1.0.0b15...v1.0.0b14
 [1.0.0b14]: ../../compare/v1.0.0b14...v1.0.0b13
 [1.0.0b13]: ../../compare/v1.0.0b13...v1.0.0b12
->>>>>>> master
 [1.0.0b12]: ../../compare/v1.0.0b12...v1.0.0b11
 [1.0.0b11]: ../../compare/v1.0.0b11...v1.0.0b10
 [1.0.0b10]: ../../compare/v1.0.0b10...v1.0.0b9