diff options
| author | nulltoken <emeric.fermas@gmail.com> | 2015-05-31 15:09:18 +0300 |
|---|---|---|
| committer | nulltoken <emeric.fermas@gmail.com> | 2015-05-31 15:09:18 +0300 |
| commit | 2c98992dd8b21dcdba04834514e057482d89a36d (patch) | |
| tree | d4c54fb41b40780af8d40b10b4a4cbfd5b288f24 | |
| parent | ba6b4b47faedbca9828afd3dd6aeaab890ea18c8 (diff) | |
| parent | 4b67760991ed8677bdb9fd4ce228547a6c61e015 (diff) | |
Remove union merge driver for sln, csproj files
| -rw-r--r-- | .gitattributes | 2 |
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 |