Fix CHANGELOG merge conflicts.

2016-03-14 11:55:50 -07:00
parent 0dcc862a56 0cacdef6c5
commit 5ceee08590
4 changed files with 32 additions and 6 deletions
--- a/1
+++ b/1
@@ -64,6 +64,7 @@ Matt Williams
 Michael Aquilina
 Michael Birtwell
 Michael Droettboom
+Mike Lundy
 Nicolas Delaby
 Pieter Mulder
 Piotr Banaszkiewicz