Permalink
Browse files

remove merge=union in .gitattributes

  • Loading branch information...
1 parent 37906f3 commit 67392062df9d671a2db905d432bb4dd0eac60d33 @suwatch suwatch committed Oct 17, 2012
Showing with 5 additions and 5 deletions.
  1. +5 −5 .gitattributes
View
@@ -42,8 +42,8 @@
*.fsx text=auto
*.hs text=auto
-*.csproj text=auto merge=union
-*.vbproj text=auto merge=union
-*.fsproj text=auto merge=union
-*.dbproj text=auto merge=union
-*.sln text=auto eol=crlf merge=union
+*.csproj text=auto
+*.vbproj text=auto
+*.fsproj text=auto
+*.dbproj text=auto
+*.sln text=auto eol=crlf

0 comments on commit 6739206

Please sign in to comment.