chore(release): 1.15.0 [skip ci]

semantic-release-bot · semantic-release-bot · commit 0c2c0fe658d4 · 2020-06-26T16:11:37.000Z
# [1.15.0](v1.14.0...v1.15.0) (2020-06-26) ### 其他 * Merge branch 'master' of https://github.com/d2-projects/electron-vue-template ([c567bb2](c567bb2)) ### 功能 * 最终测试 ([847ab9b](847ab9b))
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 规范参考：[Conventional Commits](https://conventionalcommits.org)
 
+# [1.15.0](https://github.com/d2-projects/electron-vue-template/compare/v1.14.0...v1.15.0) (2020-06-26)
+
+
+### 其他
+
+* Merge branch 'master' of https://github.com/d2-projects/electron-vue-template ([c567bb2](https://github.com/d2-projects/electron-vue-template/commit/c567bb2c3f14d4b326e41a26196aba199ee7630f))
+
+
+### 功能
+
+* 最终测试 ([847ab9b](https://github.com/d2-projects/electron-vue-template/commit/847ab9b080e338757ce5486c54582622e74a4387))
+
 # [1.14.0](https://github.com/d2-projects/electron-vue-template/compare/v1.13.0...v1.14.0) (2020-06-26)
 
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron-vue-template",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "private": true,
   "scripts": {
     "build": "vue-cli-service electron:build",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "electron-vue-template",`
`3`		`- "version": "1.14.0",`
	`3`	`+ "version": "1.15.0",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"build": "vue-cli-service electron:build",`