EGit is acting funny. Apparently there was a conflict with this file,
which makes sense since I modified it.