Pedantic indentation of ChangeLog and remove merge leftover
1 file changed