Fixed linefeeds on merged files to unix linefeeds

Browse Source

Merge utility changed the linefeeds from unix to windows.  Changed the
linefeeds back to unix linefeeds.

...

This commit is contained in:

Jason Erickson 2011-02-10 17:16:10 -07:00

parent 3fc4dcec06

commit 68ccac1766

3 changed files with 645 additions and 645 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files