A couple of fixes

.gitattributes * Comment and fix opening line "Auto detect..." * Add .csproj and .sln definitions from my own repositories
ZiwKerman · Feb 22, 2016 · 0b4325c · 0b4325c
1 parent ecc934b
commit 0b4325c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,8 @@
-uto detect text files and perform LF normalization
+# Auto detect text files and perform LF normalization
 # http://davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/
 * text=auto
 
 *.cs     diff=csharp
+
+*.csproj text=auto merge=union
+*.sln text=auto eol=crlf merge=union