Hunk #1 Failed at line 814 (Different line endings) SUPEE-6285

[Ericclay]

 I have an odd problem where the recent patch.  On my mage.php file the patcher is rejecting the mage file.  Line 814 is an empty line. 

Below is my code (At top of image) and the newely released code with the patch already applied at the bottom.  I don't see any reason for line 814 to be throwing an error.  Both are empty lines.  All previous patches have been applied.

Its possible there is a Tab or something here that is different..  Any thoughts?

-Eric

[chiefair]

Different Line Endings means that an MSDOS file got uploaded to a Linux server without proper line ending translation.

The line endings are CRLF (\r\n) instead of being LF (\n) only.

As line endings are non-visible, you won't see anything.

[Mukesh Tiwari]

Hi @Ericclay

Which operating system are you using ? 

Basically I want to know where your Magento files resides on Linux or Windows machine?