grrr... line ending confuses git

I don't understand git. Yes, it is crlf on server - but untouched since a year and no problem until now.
Discard doesn't work so the only way is commit. Otherwise I can't never checkout another branch.
all calendars: prevent multiple borders (issues #715, #716)