Merge branch 'master' of https://github.com/dskoog/Maple-ClusterAnalysis

dskoog · May 17, 2017 · 97ff0d4 · 97ff0d4
2 parents c0e77b3 + f61729e
commit 97ff0d4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 64 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,17 +1,6 @@
-# Auto detect text files and perform LF normalization
-* text=auto
-
-# Custom for Visual Studio
-*.cs     diff=csharp
-
-# 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
+*.mw linguist-language=Maple
+*.mm linguist-language=Maple
+*.md linguist-language=Maple
+*.mpl linguist-language=Maple
+*.help linguist-language=Maple
+*.mla linguist-language=Maple
diff --git a/.gitignore b/.gitignore