This is going to sound picky, but please ensure files end with a newline character. Committing selective lines using `git gui` and similar tools breaks if this is missing.

Please can you use `git commit --amend` and `git push -f` to undo this so that it isn't in the history where it could cause merge errors. If you wish, I can do the commit for you if you prefer.