Rewrite Makefile using NPS Scripts. Closes mochajs#2352

Addresses mochajs#2352
TedYav · Jan 8, 2018 · 3a183d9 · 3a183d9
1 parent d592429
commit 3a183d9
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/package-scripts.js b/package-scripts.js
@@ -102,6 +102,10 @@ module.exports = {
     buildDocs: 'nps prebuildDocs && bundle exec jekyll build --source ./docs --destination ./docs/_site --config ./docs/_config.yml --safe --drafts && nps postbuildDocs',
     postbuildDocs: 'buildProduction docs/_site/index.html --outroot docs/_dist --canonicalroot https://mochajs.org/ --optimizeimages --svgo --inlinehtmlimage 9400 --inlinehtmlscript 0 --asyncscripts && cp docs/_headers docs/_dist/_headers && node scripts/netlify-headers.js >> docs/_dist/_headers',
     prewatchDocs: 'node scripts/docs-update-toc.js',
+<<<<<<< HEAD
     watchDocs: 'nps prewatchDocs && bundle exec jekyll serve --source ./docs --destination ./docs/_site --config ./docs/_config.yml --safe --drafts --watch'
+=======
+    watchDocs: 'nps prewatchDocs && bundle exec jekyll serve --source ./docs --destination ./docs/_site --config ./docs/_config.yml --safe --drafts --watch',
+>>>>>>> 7c830a6... Rewrite Makefile using NPS Scripts. Closes #2352
   }
 };