# Auto detect text files and perform LF normalization
* text=lf
* text eol=lf

# Custom for Visual Studio
*.sln     merge=union
*.vcxproj merge=union