diff options
| author | Eliot Whalan <ewhal@pantsu.cat> | 2016-06-14 13:31:07 +0200 |
|---|---|---|
| committer | Eliot Whalan <ewhal@pantsu.cat> | 2016-06-14 13:31:07 +0200 |
| commit | 3a9574bdfff52bc5f8e6b0d94d8f564ff9cf1044 (patch) | |
| tree | 8102c1a82d61b00ee7f2f001ff9a587bf3077b1f | |
| parent | b0ccd22c1c35bac16699282cad77e664f698126d (diff) | |
Resolve merge conflict
| -rw-r--r-- | Gruntfile.js | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 0cb7d9c..e8250f3 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -98,9 +98,5 @@ module.exports = function (grunt) { grunt.loadNpmTasks('grunt-contrib-imagemin'); grunt.loadNpmTasks('grunt-contrib-copy'); -<<<<<<< HEAD - grunt.registerTask('default', ['swig', 'htmlmin', 'cssmin', 'uglify', 'copy']); -======= - grunt.registerTask('default', ['mkdir', 'swig', 'htmlmin', 'cssmin', 'uglify', 'imagemin', 'copy']); ->>>>>>> parent of 90e6b7b... Remove grunt-contrib-imagemin image minification + grunt.registerTask('default', ['swig', 'htmlmin', 'cssmin', 'uglify', 'imagemin', 'copy']); }; |