chore: resolve merge conflict

DawChihLiou · Sep 16, 2020 · d51d79e · d51d79e
2 parents 2985968 + 85a2eb5
commit d51d79e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,13 @@
+# [3.4.0](https://github.com/DawChihLiou/cz-conventional-changelog-with-jiraid-detection/compare/v3.3.0...v3.4.0) (2020-09-16)
+
+
+### Bug Fixes
+
+* **package.json:** install missing dependency ([4287211](https://github.com/DawChihLiou/cz-conventional-changelog-with-jiraid-detection/commit/4287211eacf0d4adb5f2526969c684ac4f1535c4))
+* **release:** attempt to fix release ([c167fd8](https://github.com/DawChihLiou/cz-conventional-changelog-with-jiraid-detection/commit/c167fd8e2624674c2f80db735be42bdf7dc382d0))
+* **release.config.js:** attempt to fix semantic release ([e362f9a](https://github.com/DawChihLiou/cz-conventional-changelog-with-jiraid-detection/commit/e362f9af27429f587f837716fbbd7f7b9138b75e))
+
+
+### Features
+
+* **engine.js:** add jira step ([b6c6bfb](https://github.com/DawChihLiou/cz-conventional-changelog-with-jiraid-detection/commit/b6c6bfb3014a6bbb35e36892bbb6936c4319bec9))
diff --git a/package-lock.json b/package-lock.json