Fix CHANGELOG merge conflicts.

This commit is contained in:
Kale Kundert
2016-03-14 11:55:50 -07:00
4 changed files with 32 additions and 6 deletions

View File

@@ -64,6 +64,7 @@ Matt Williams
Michael Aquilina
Michael Birtwell
Michael Droettboom
Mike Lundy
Nicolas Delaby
Pieter Mulder
Piotr Banaszkiewicz