# Custom for Visual Studio *.cs diff=csharp *.csproj text merge=union *.sln text merge=union eol=crlf