Skip to content

Commit

Permalink
merge upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
yannikmethot committed Mar 7, 2016
2 parents 9e1bd95 + 7e43530 commit af25d99
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions src/tasks/bless.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,17 @@ module.exports = function(grunt) {
header += options.banner + grunt.util.linefeed;
}

header += file_utils.imports({
numFiles: filesLength,
output: outPutfileName,
suffix: suffix,
linefeed: (options.compress ? '' : grunt.util.linefeed),
pathType: options.pathType
});

header += grunt.util.linefeed;
if (options.imports) {
header += file_utils.imports({
numFiles: filesLength,
output: outPutfileName,
suffix: suffix,
linefeed: (options.compress ? '' : grunt.util.linefeed),
pathType: options.pathType
});

header += grunt.util.linefeed;
}

// The main file is always the last one in the array.
// So add the header here before we iterate.
Expand Down

0 comments on commit af25d99

Please sign in to comment.