aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlempamo <[email protected]>2017-06-11 17:59:30 -0400
committerlempamo <[email protected]>2017-06-11 17:59:30 -0400
commit9f1be00ea3ae4a4353fa7cba059c25f34aef0e1a (patch)
treeac9a5aaadafc476874fc291c255db1597388e88d
parent8f7f5ef45e578874feb305895df724db227dc12d (diff)
parent4b20ee479f2101b691e2254de3228ce9e60c6377 (diff)
downloadhistacom2-9f1be00ea3ae4a4353fa7cba059c25f34aef0e1a.tar.gz
histacom2-9f1be00ea3ae4a4353fa7cba059c25f34aef0e1a.tar.bz2
histacom2-9f1be00ea3ae4a4353fa7cba059c25f34aef0e1a.zip
Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'
-rw-r--r--.gitattributes77
1 files changed, 77 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..8e32b91
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,77 @@
+* text=auto
+
+
+
+#
+
+# The above will handle all files NOT found below
+
+#
+
+# These files are text and should be normalized (Convert crlf => lf)
+
+*.css text
+
+*.df text
+
+*.htm text
+
+*.html text
+
+*.java text
+
+*.js text
+
+*.json text
+
+*.jsp text
+
+*.jspf text
+
+*.jspx text
+
+*.properties text
+
+*.sh text
+
+*.tld text
+
+*.txt text
+
+*.tag text
+
+*.tagx text
+
+*.xml text
+
+*.yml text
+
+*.sh text
+
+# These files are binary and should be left untouched
+
+# (binary is a macro for -text -diff)
+
+*.class binary
+
+*.dll binary
+
+*.ear binary
+
+*.gif binary
+
+*.ico binary
+
+*.jar binary
+
+*.jpg binary
+
+*.jpeg binary
+
+*.png binary
+
+*.so binary
+
+*.war binary
+
+*.exe binary