From a283f0664846aef21fefadc559b7246c3e8f8ee5 Mon Sep 17 00:00:00 2001 From: Joel Mello Date: Mon, 25 Nov 2024 20:11:49 -0700 Subject: [PATCH] chore(conflict): fix merge conflict --- Gruntfile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index f496550c..be0f693c 100755 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -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" ] ); };