From 2982bba451d032a9652b82fe963db67acb8e8f90 Mon Sep 17 00:00:00 2001 From: Qstick Date: Sat, 24 Aug 2019 17:04:22 -0400 Subject: [PATCH] Fixed: Remove other unneeded gitattributes Co-Authored-By: taloth --- .gitattributes | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/.gitattributes b/.gitattributes index 17a25adb7..e9852ad00 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,19 +6,4 @@ # Custom for Visual Studio *.cs diff=csharp -*.sln merge=union -*.vbproj merge=union -*.fsproj merge=union -*.dbproj merge=union - -# Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain \ No newline at end of file +*.sln merge=union \ No newline at end of file