remove merge=union in .gitattributes

projectkudu · Oct 17, 2012 · 6739206 · 6739206
1 parent 37906f3
commit 6739206
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -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