From 604552aeee3efb250e9a20f6b1987b0fc0b2c328 Mon Sep 17 00:00:00 2001
From: Jamie Peabody <jamie.peabody@gmail.com>
Date: Thu, 15 Nov 2012 19:24:58 +0000
Subject: [PATCH] Added .gitattributes

---
 .gitattributes | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..224a3eb
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,21 @@
+# Auto detect text files and perform LF normalization
+*        text=auto
+
+*.c      text
+*.cpp    text
+*.cs     text diff=csharp
+*.css    text
+*.h      text
+*.hpp    text
+*.html   text diff=html
+*.java   text diff=java
+*.js     text
+*.less   text
+*.sql    text
+*.xml    text
+
+*.csproj text merge=union
+*.sln    text merge=union eol=crlf
+
+*.docx   diff=astextplain
+*.DOCX   diff=astextplain