Merge pull request #5 from pangolp/gitattributes

Correcting errors when doing push / pull

.gitattributes

@@ -1,105 +1,104 @@
-## AUTO-DETECT
-##   Handle line endings automatically for files detected as
-##   text and leave all files detected as binary untouched.
-##   This will handle all files NOT defined below.
-* text = auto eol = lf
-
-# Text
-* .conf text
-* .conf.dist text
-* .cmake text
-
-## Scripts
-* .sh text
-* .fish text
-* .lua text
-
-## SQL
-* .sql text
-
-## C++
-* .c text
-* .cc text
-* .cxx text
-* .cpp text
-* .c++ text
-* .hpp text
-* .h text
-* .h++ text
-* .hh text
-
-
-## For documentation
-
-# Documents
-* .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
-
-## DOCUMENTATION
-* .markdown   text
-* .md         text
-* .mdwn       text
-* .mdown      text
-* .mkd        text
-* .mkdn       text
-* .mdtxt      text
-* .mdtext     text
-* .txt        text
-AUTHORS      text
-CHANGELOG    text
-CHANGES      text
-CONTRIBUTING text
-COPYING      text
-copyright    text
-* COPYRIGHT * text
-INSTALL      text
-license      text
-LICENSE      text
-NEWS         text
-readme       text
-* README * text
-TODO         text
-
-## GRAPHICS
-* .ai   binary
-* .bmp  binary
-* .eps  binary
-* .gif  binary
-* .ico  binary
-* .jng  binary
-* .jp2  binary
-* .jpg  binary
-* .jpeg binary
-* .jpx  binary
-* .jxr  binary
-* .pdf  binary
-* .png  binary
-* .psb  binary
-* .psd  binary
-* .svg  text
-* .svgz binary
-* .tif  binary
-* .tiff binary
-* .wbmp binary
-* .webp binary
-
-
-## ARCHIVES
-* .7z  binary
-* .gz  binary
-* .jar binary
-* .rar binary
-* .tar binary
-* .zip binary
-
-## EXECUTABLES
-* .exe binary
-* .pyc binary
+## AUTO-DETECT
+##   Handle line endings automatically for files detected as
+##   text and leave all files detected as binary untouched.
+##   This will handle all files NOT defined below.
+* text eol=lf
+
+# Text
+*.conf text
+*.conf.dist text
+*.cmake text
+
+## Scripts
+*.sh text
+*.fish text
+*.lua text
+
+## SQL
+*.sql text
+
+## C++
+*.c text
+*.cc text
+*.cxx text
+*.cpp text
+*.c++ text
+*.hpp text
+*.h text
+*.h++ text
+*.hh text
+
+## For documentation
+
+# Documents
+*.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
+
+## DOCUMENTATION
+*.markdown   text
+*.md         text
+*.mdwn       text
+*.mdown      text
+*.mkd        text
+*.mkdn       text
+*.mdtxt      text
+*.mdtext     text
+*.txt        text
+AUTHORS      text
+CHANGELOG    text
+CHANGES      text
+CONTRIBUTING text
+COPYING      text
+copyright    text
+COPYRIGHT    text
+INSTALL      text
+license      text
+LICENSE      text
+NEWS         text
+readme       text
+README       text
+TODO         text
+
+## GRAPHICS
+*.ai   binary
+*.bmp  binary
+*.eps  binary
+*.gif  binary
+*.ico  binary
+*.jng  binary
+*.jp2  binary
+*.jpg  binary
+*.jpeg binary
+*.jpx  binary
+*.jxr  binary
+*.pdf  binary
+*.png  binary
+*.psb  binary
+*.psd  binary
+*.svg  text
+*.svgz binary
+*.tif  binary
+*.tiff binary
+*.wbmp binary
+*.webp binary
+
+
+## ARCHIVES
+*.7z  binary
+*.gz  binary
+*.jar binary
+*.rar binary
+*.tar binary
+*.zip binary
+
+## EXECUTABLES
+*.exe binary
+*.pyc binary