From fa8a7084477fe921d5e9f857c87f02bbba5ce1f4 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Sat, 9 Apr 2016 22:49:27 -0700 Subject: [PATCH] This isn't needed. --- .gitattributes | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.gitattributes b/.gitattributes index 0de8645d3..d179a4286 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,23 +3,3 @@ builds/* -text index.html -text - -# 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 -*.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