From 3cd715273aeb64727afb6e1aa4cdfc117f8d8fba Mon Sep 17 00:00:00 2001 From: ccd0 Date: Tue, 20 Jan 2015 01:22:52 -0800 Subject: [PATCH] Fix CRLF issues when building on Windows. --- .gitattributes | 2 ++ Gruntfile.coffee | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 67d83c596..f3760d287 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,8 @@ # Auto detect text files and perform LF normalization * text=auto +builds/* -text + # Custom for Visual Studio *.cs diff=csharp *.sln merge=union diff --git a/Gruntfile.coffee b/Gruntfile.coffee index c39683cb6..e03c9f494 100755 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -2,7 +2,7 @@ module.exports = (grunt) -> grunt.util.linefeed = '\n' importHTML = (filename) -> - "(innerHTML: #{JSON.stringify grunt.file.read("src/General/html/#{filename}.html").replace(/^\s+|\s+$ parts = template.split /([\$&@]){([^}`]*)}/