Merge branch 'master' into master

c-swope · web-flow · commit 01c6d4527487 · 2017-12-01T10:09:37.000-07:00
diff --git a/swagger-editor-dist-package/package.json b/swagger-editor-dist-package/package.json
@@ -1,7 +1,7 @@
 {
   "name": "swagger-editor-dist",
   "version": "$$VERSION",
-  "main": "dist/swagger-editor.js",
+  "main": "swagger-editor.js",
   "repository": "git@github.com:swagger-api/swagger-editor.git",
   "contributors": [
     "(in alphabetical order)",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "swagger-editor-dist",`
`3`	`3`	`"version": "$$VERSION",`
`4`		`- "main": "dist/swagger-editor.js",`
	`4`	`+ "main": "swagger-editor.js",`
`5`	`5`	`"repository": "[email protected]:swagger-api/swagger-editor.git",`
`6`	`6`	`"contributors": [`
`7`	`7`	`"(in alphabetical order)",`