fix: conflicts

ootkin · ootkin · commit 149d3ece7a2a · 2023-12-19T23:25:53.000+01:00
diff --git a/.commitlintrc.json b/.commitlintrc.json
@@ -1,6 +1,8 @@
 {
   "extends": ["@commitlint/config-conventional"],
   "rules": {
-    "body-max-line-length": [0, "always", "Infinity"]
+    "body-max-line-length": [0, "always", "Infinity"],
+    "footer-max-line-length": [0, "always", "Infinity"],
+    "footer-leading-blank": [0, "always", "Infinity"]
   }
 }
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -5,7 +5,7 @@ on:
     branches: ["main"]
 
 jobs:
-  release:
+  pr-check:
     name: Pull request
     runs-on: ubuntu-latest
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
-  "name": "node-template",
+  "name": "@ootkin/node-template",
   "repository": {
     "type": "git",
     "url": "https://github.com/ootkin/node-template.git"
   },
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A starter template for nodejs applications",
   "files": [
     "dist"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": ["@commitlint/config-conventional"],`
`3`	`3`	`"rules": {`
`4`		`- "body-max-line-length": [0, "always", "Infinity"]`
	`4`	`+ "body-max-line-length": [0, "always", "Infinity"],`
	`5`	`+ "footer-max-line-length": [0, "always", "Infinity"],`
	`6`	`+ "footer-leading-blank": [0, "always", "Infinity"]`
`5`	`7`	`}`
`6`	`8`	`}`