From de5a1c1a2f83d5fcc95e921dab9c6d6d15332104 Mon Sep 17 00:00:00 2001 From: Benjamin Adams <Armastevs@gmail.com> Date: Mon, 15 Jul 2013 13:50:58 -0500 Subject: [PATCH] Changed gitignore --- .gitattributes | 22 ---------------------- .gitignore | 2 ++ 2 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 412eeda..0000000 --- a/.gitattributes +++ /dev/null @@ -1,22 +0,0 @@ -# Auto detect text files and perform LF normalization -* text=auto - -# 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 diff --git a/.gitignore b/.gitignore index b9d6bd9..610b34c 100644 --- a/.gitignore +++ b/.gitignore @@ -213,3 +213,5 @@ pip-log.txt #Mr Developer .mr.developer.cfg + +*.zip -- GitLab