Fix merge conflicts

netlify · Sep 18, 2019 · a1e5589 · a1e5589
1 parent 8129ff5
commit a1e5589
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 22 deletions.
diff --git a/js/generate-module.js b/js/generate-module.js
diff --git a/package.json b/package.json
@@ -50,14 +50,14 @@
     "prepublishOnly": "git push && git push --tags && gh-release",
     "prepare": "run-s lint build test",
     "start": "run-s lint build serve",
-    "build": "run-s clean js site",
+    "build": "run-s clean convert site",
     "clean": "rimraf js/dist ui/dist && mkdirp js/dist ui/dist",
     "convert": "node ./js/convert.js",
     "site": "run-p site:*",
     "site:css": "postcss ui/index.css -o ui/dist/bundle.css",
     "site:js": "browserify ui/index.js -o ui/dist/bundle.js",
     "site:static": "cpx \"ui/{index.html,static/**}\" ui/dist",
-    "site:swagger": "node ./ui/include-swagger.js",
+    "site:swagger": "node ./ui/convert.js",
     "serve": "budo --dir ui/dist",
     "version": "run-s version:*",
     "version:1-swagger": "node js/bump-swagger.js",

diff --git a/ui/include-swagger.js b/ui/include-swagger.js