Resolved merge conflicts with develop

becaaye · Nov 21, 2023 · 11cb55a · 11cb55a
2 parents 26cd188 + 2b51616
commit 11cb55a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/.npmignore b/.npmignore
@@ -5,6 +5,7 @@ jest.config.js
 src/
 test/
 node_modules/
+.github/
 
 .gitignore
 *.cjs

diff --git a/package.json b/package.json
@@ -46,6 +46,7 @@
     "csv-parser": "^3.0.0"
   },
   "devDependencies": {
+    "@semantic-release/commit-analyzer": "^11.1.0",
     "@semantic-release/commit-analyzer": "^11.1.0",
     "@semantic-release/git": "^10.0.1",
     "@semantic-release/github": "^9.2.3",

diff --git a/release.config.cjs b/release.config.cjs
@@ -1,7 +1,6 @@
 const config = {
     branches: ["main"],
     plugins: [
-        "@semantic-release/commit-analyser",
         "@semantic-release/release-notes-generator",
         "@semantic-release/github",
         "@semantic-release/npm",
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ jest.config.js @@
     src/
     test/
     node_modules/
+    .github/
     .gitignore
     *.cjs
@@ Expand Down @@