1 files changed, 0 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes
index be48d622..9d132e95 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,5 +3,3 @@
 
 # Custom for Visual Studio
 *.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union