From 3a9574bdfff52bc5f8e6b0d94d8f564ff9cf1044 Mon Sep 17 00:00:00 2001 From: Eliot Whalan Date: Tue, 14 Jun 2016 21:31:07 +1000 Subject: Resolve merge conflict --- Gruntfile.js | 6 +----- 1 file changed, 1 insertion(+), 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']); }; -- cgit v1.2.3