Skip to content

Commit

Permalink
Merge branch 'master' of github.com:bassettsj/awesome_theme
Browse files Browse the repository at this point in the history
Conflicts:
	Gruntfile.js
bassettsj committed Jun 2, 2014
2 parents ca53916 + 1af58e3 commit 60659c9
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -33,8 +33,7 @@ module.exports = function(grunt) {

grunt.registerTask(
'default',
'Compile SASS & Vendor Prefix',
[
'Compile SASS & Vendor Prefix', [
'sass:theme',
'autoprefixer:theme'
]

0 comments on commit 60659c9

Please sign in to comment.