Skip to content

Commit

Permalink
Clean up some merge artifacts
Browse files Browse the repository at this point in the history
  • Loading branch information
@pfiller
pfiller committed Mar 28, 2015
1 parent 3a89587 commit e7c26a4
Showing 1 changed file with 0 additions and 18 deletions.
18 changes: 0 additions & 18 deletions Gruntfile.coffee
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,25 +112,7 @@ This file is generated by `grunt build`, do not edit it by hand.
grunt.registerTask 'default', ['build']
grunt.registerTask 'build', ['coffee', 'compass', 'concat', 'uglify', 'cssmin', 'package-bower']
grunt.registerTask 'prep-release', ['build', 'dom_munger:latest_version', 'zip:chosen','package-jquery']

grunt.loadNpmTasks 'grunt-contrib-coffee'
grunt.loadNpmTasks 'grunt-contrib-uglify'
grunt.loadNpmTasks 'grunt-contrib-concat'
grunt.loadNpmTasks 'grunt-contrib-watch'
grunt.loadNpmTasks 'grunt-contrib-copy'
grunt.loadNpmTasks 'grunt-contrib-clean'
grunt.loadNpmTasks 'grunt-contrib-compass'
grunt.loadNpmTasks 'grunt-contrib-cssmin'
grunt.loadNpmTasks 'grunt-build-gh-pages'
grunt.loadNpmTasks 'grunt-zip'
grunt.loadNpmTasks 'grunt-dom-munger'
grunt.loadNpmTasks 'grunt-contrib-jasmine'

grunt.registerTask 'default', ['build']
grunt.registerTask 'build', ['coffee', 'compass', 'concat', 'uglify', 'cssmin']
grunt.registerTask 'test', ['coffee', 'jasmine']
grunt.registerTask 'gh_pages', ['copy:dist', 'build_gh_pages:gh_pages']
grunt.registerTask 'prep_release', ['build','zip:chosen','package_jquery']

grunt.registerTask 'publish-release', ['gh-pages']

Expand Down

1 comment on commit e7c26a4

@adunkman
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❤️

Please sign in to comment.