What happened here?  Is this file actually changed by your update or have you changed the line-endings?

If you're going to fix up line endings, you might as well also fix the indentation at the same time.