diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 412eeda78dc9de1186c2e0e1526764af82ab3431..0000000000000000000000000000000000000000 --- 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 b9d6bd92f5f09e195d6bc19536500b6494dd2b75..610b34c6a6e79a6f593af4f482e5d3a0efc7c278 100644 --- a/.gitignore +++ b/.gitignore @@ -213,3 +213,5 @@ pip-log.txt #Mr Developer .mr.developer.cfg + +*.zip