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
2 parents a283f06 + 5adfa31 commit 3bfbcc6
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@ module.exports = function( grunt ) {
} ]
}
},

clean: {
pushFW: [ "build/firmware/*", "build/app.zip" ],
symres: [ "www/res" ]
Expand Down

0 comments on commit 3bfbcc6

Please sign in to comment.