Cleanup merge conflicts and update package script

This commit is contained in:
nitrohorse
2019-08-03 15:48:42 -07:00
parent 635152fbb1
commit 2a96893aca
5 changed files with 457 additions and 457 deletions

View File

@ -9,7 +9,7 @@
"scripts": { "scripts": {
"build": "bundle exec jekyll build", "build": "bundle exec jekyll build",
"serve": "bundle exec jekyll serve", "serve": "bundle exec jekyll serve",
"html-beautify": "node_modules/.bin/html-beautify --editorconfig .editorconfig -r '**/*.html'", "html-beautify": "node_modules/.bin/html-beautify --editorconfig .editorconfig -r '**/*.html'; git add \\*.html",
"beautify-and-build": "npm run html-beautify && npm run build" "beautify-and-build": "npm run html-beautify && npm run build"
}, },
"husky": { "husky": {