merge master

This commit is contained in:
Peter Cottle 2021-01-11 12:10:07 -07:00
commit c00e0aba05

View file

@ -164,7 +164,7 @@ var gitDeployMergeMaster = function(done) {
var gitDeployPushOrigin = function(done) { var gitDeployPushOrigin = function(done) {
execSync('git commit -am "rebuild for prod"; ' + execSync('git commit -am "rebuild for prod"; ' +
'git push origin gh-pages && ' + 'git push origin gh-pages --force && ' +
'git branch -f trunk gh-pages && ' + 'git branch -f trunk gh-pages && ' +
'git checkout master' 'git checkout master'
); );