Skip to content

Commit

Permalink
chore(conflict): fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
mellodev committed Nov 26, 2024
1 parent 7215f80 commit a283f06
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,6 @@ module.exports = function( grunt ) {
grunt.registerTask( "pushFW", [ "compress:makeFW", "shell:updateUI", "clean:pushFW" ] );
grunt.registerTask( "pushBetaFW", [ "compress:makeFW", "shell:updateBetaUI", "clean:pushFW" ] );
grunt.registerTask( "build", [ "default", "shell:symres", "pushFW", "clean:symres" ] );
grunt.registerTask( "bump", [ "default", "replace:about", "replace:cordova", "replace:manifests", "shell:pushBump" ] );
grunt.registerTask( "bump-version", [ "default", "replace:about", "replace:cordova", "replace:manifests" ] );
grunt.registerTask( "bump", [ "default", "replace:about", "replace:cordova", "replace:manifests", "replace:sw", "shell:pushBump" ] );
grunt.registerTask( "bump-version", [ "default", "replace:about", "replace:cordova", "replace:manifests", "replace:sw" ] );
};

0 comments on commit a283f06

Please sign in to comment.