summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-06-24 22:17:39 +0900
committerJosé Fonseca <jrfonseca@tungstengraphics.com>2008-06-24 22:25:52 +0900
commit67262c82a17eebfb58cfbf39e512a5981185acfe (patch)
tree586e97c750278f47177f11e9bb0556ab9005501e
parente95697758eda9b92a01a504bce823acd5201b48d (diff)
Allow CRLF automatic conversion on MSVC project files.
MSVC doesn't really care, and it is frequently causing merge conflicts.
-rwxr-xr-x.gitattributes4
1 files changed, 0 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100755
index 23c6280f6d..0000000000
--- a/.gitattributes
+++ /dev/null
@@ -1,4 +0,0 @@
-*.dsp -crlf
-*.dsw -crlf
-*.sln -crlf
-*.vcproj -crlf