#20 removed corrupt nuget.exe, fixed .gitattributes

ctaggart · Apr 9, 2014 · 111d81d · 111d81d
1 parent 51d01c5
commit 111d81d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,14 +1,8 @@
-# git help gitattributes
-# text=auto
-#   When text is set to "auto", the path is marked for automatic end-of-line normalization.
-#   If Git decides that the content is text, its line endings are normalized to LF on checkin.
-# eol=lf
-#   This attribute sets a specific line-ending style to be used in the working directory.
-# git help merge-file
-# merge=union
-#   Instead of leaving conflicts in the file, resolve conflicts favouring our (or their or both) side of the lines.
+# Autodetect text or binary. Do not leave merge conflict markers in the files.
+* text=auto merge=union
+
+# Use LF in the working directory by default. Override with core.autocrlf=true.
+*.fs eol=lf
 
-# Normalize to LF in the repository and working directory. Do not leave merge conflict markers in the files.
-* text=auto eol=lf merge=union
 # Visual Studio can read LF sln files, but it always writes them as CRLF.
-*.sln text eol=crlf
+*.sln eol=crlf
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe