TrimArray() simplification

[NovacoinLibrary.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 33ccea3..1ff0c42 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,64 +1,63 @@
-###############################################################################\r
-# Set default behavior to automatically normalize line endings.\r
-###############################################################################\r
-#* text=auto\r
-* -crlf
-\r
-###############################################################################\r
-# Set default behavior for command prompt diff.\r
-#\r
-# This is need for earlier builds of msysgit that does not have it on by\r
-# default for csharp files.\r
-# Note: This is only used by command line\r
-###############################################################################\r
-#*.cs     diff=csharp\r
-\r
-###############################################################################\r
-# Set the merge driver for project and solution files\r
-#\r
-# Merging from the command prompt will add diff markers to the files if there\r
-# are conflicts (Merging from VS is not affected by the settings below, in VS\r
-# the diff markers are never inserted). Diff markers may cause the following \r
-# file extensions to fail to load in VS. An alternative would be to treat\r
-# these files as binary and thus will always conflict and require user\r
-# intervention with every merge. To do so, just uncomment the entries below\r
-###############################################################################\r
-#*.sln       merge=binary\r
-#*.csproj    merge=binary\r
-#*.vbproj    merge=binary\r
-#*.vcxproj   merge=binary\r
-#*.vcproj    merge=binary\r
-#*.dbproj    merge=binary\r
-#*.fsproj    merge=binary\r
-#*.lsproj    merge=binary\r
-#*.wixproj   merge=binary\r
-#*.modelproj merge=binary\r
-#*.sqlproj   merge=binary\r
-#*.wwaproj   merge=binary\r
-\r
-###############################################################################\r
-# behavior for image files\r
-#\r
-# image files are treated as binary by default.\r
-###############################################################################\r
-#*.jpg   binary\r
-#*.png   binary\r
-#*.gif   binary\r
-\r
-###############################################################################\r
-# diff behavior for common document formats\r
-# \r
-# Convert binary document formats to text before diffing them. This feature\r
-# is only available from the command line. Turn it on by uncommenting the \r
-# entries below.\r
-###############################################################################\r
-#*.doc   diff=astextplain\r
-#*.DOC   diff=astextplain\r
-#*.docx  diff=astextplain\r
-#*.DOCX  diff=astextplain\r
-#*.dot   diff=astextplain\r
-#*.DOT   diff=astextplain\r
-#*.pdf   diff=astextplain\r
-#*.PDF   diff=astextplain\r
-#*.rtf   diff=astextplain\r
-#*.RTF   diff=astextplain\r
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.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