From 0b4325c3aef7835b2e5bba25506b9ba6c860eae3 Mon Sep 17 00:00:00 2001
From: Brad White <hvacengi@gmail.com>
Date: Mon, 22 Feb 2016 10:55:52 -0500
Subject: [PATCH] A couple of fixes

.gitattributes
* Comment and fix opening line "Auto detect..."
* Add .csproj and .sln definitions from my own repositories
---
 .gitattributes | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 7303c2aed..771770f38 100644
--- 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
\ No newline at end of file