Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into develop

  • Loading branch information...
commit a7bb475d6adeb3ba20404d62b1ab8428f26dd380 2 parents 8986938 + 06b7f62
@jbogard jbogard authored
Showing with 8 additions and 33 deletions.
  1. +8 −33 .gitattributes
View
41 .gitattributes
@@ -13,37 +13,12 @@
*.png binary
*.gif binary
-*.cs text diff=csharp
-*.vb text
-*.c text
-*.cpp text
-*.cxx text
-*.h text
-*.hxx text
-*.py text
-*.rb text
-*.java text
-*.html text
-*.htm text
-*.css text
-*.scss text
-*.sass text
-*.less text
-*.js text
-*.lisp text
-*.clj text
-*.sql text
-*.php text
-*.lua text
-*.m text
-*.asm text
-*.erl text
-*.fs text
-*.fsx text
-*.hs text
+core.eol crlf
-*.csproj text merge=union
-*.vbproj text merge=union
-*.fsproj text merge=union
-*.dbproj text merge=union
-*.sln text eol=crlf merge=union
+*.cs diff=csharp
+
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+*.sln merge=union

0 comments on commit a7bb475

Please sign in to comment.
Something went wrong with that request. Please try again.