Remove merge=union from the .gitattributes file

flagbug · flagbug · commit c9cbba12c67b · 2015-03-19T17:24:20.000+01:00
diff --git a/.gitattributes b/.gitattributes
@@ -3,11 +3,6 @@
 
 # Custom for Visual Studio
 *.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
 
 # Standard to msysgit
 *.doc	 diff=astextplain
