Fixed merge errors in ChangeLog text
Fixed merge errors in ChangeLog text

ghaderer/libmicrohttpd,maru/libmicrohttpd-http2,ghaderer/libmicrohttpd,maru/libmicrohttpd-http2,maru/libmicrohttpd-http2,ghaderer/libmicrohttpd