First try at merging didn't go so well.
[jalview.git] / .gitattributes
2014-10-14 gmungocJAL-1551 CRLF handling
2014-10-10 gmungocJAL-1551 CRLF handling