Skip to content

Commit 2c98992

Browse files
nulltokennulltoken
committed
Merge pull request #1063 from libgit2/ethomson/gitattributes
Remove union merge driver for sln, csproj files
2 parents ba6b4b4 + 4b67760 commit 2c98992

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

‎.gitattributes

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,3 @@
33

44
# Custom for Visual Studio
55
*.cs diff=csharp
6-
*.sln merge=union
7-
*.csproj merge=union

0 commit comments

Comments
 (0)