[libosmium] 03/05: Fix CHANGELOG.md merge.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository libosmium.

commit a85be90edec1dc1c37f148327c4d8193ae23d6f0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jun 18 12:05:56 2017 +0200

    Fix CHANGELOG.md merge.
---
 CHANGELOG.md | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57d05bb..a7ddcc3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,36 +6,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [unreleased] -
 
-### Fixed
-
-## [2.11.3] - 2017-05-03
-
-### Fixed
-
-- Two bugs in area assembler affecting very complex multipolygons and
-  multipolygons with overlapping or nearly overlapping lines.
-- Invalid use of iterators leading to undefined behaviour in area assembler
-  code.
-- Read OPL file correctly even if trailing newline in file is missing.
-
-
-## [2.11.2] - 2017-04-10
-
-### Fixed
-
-- Use minimum size of 64 bytes for buffers. This fixes an infinite loop
-  when buffer size is zero.
-
+### Added
 
-## [2.11.1] - 2017-03-07
+### Changed
 
 ### Fixed
 
-- Terminate called on full non-auto-growing buffer. (Issue #189.)
-- When file formats were used that were not compiled into the binary, it
-  terminated instead of throwing. (Issue #197.)
-- The `Filter::count()` method didn't compile at all.
-
 
 ## [2.12.2] - 2017-05-3
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libosmium.git