Merge pull request #921 from NordicSemiconductor/fix/lint-issue

kylebonnici · web-flow · commit e52fb1e1637e · 2023-12-07T14:47:27.000+01:00
Fix/lint issue
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -4,4 +4,9 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
  */
 
-module.exports = require('@nordicsemiconductor/pc-nrfconnect-shared/config/eslintrc');
+const defaultEslintrc = require('@nordicsemiconductor/pc-nrfconnect-shared/config/eslintrc');
+
+module.exports = {
+    ...defaultEslintrc,
+    ignorePatterns: [...defaultEslintrc.ignorePatterns, 'doc/docs'],
+};
diff --git a/Changelog.md b/Changelog.md
@@ -1,4 +1,4 @@
-## 4.3.0 - UNRELEASED
+## 4.3.0 - 2023-12-07
 
 ### Added
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "nrfconnect",
-    "version": "4.3.0-pre2",
+    "version": "4.3.0",
     "description": "nRF Connect for Desktop",
     "repository": {
         "type": "git",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "nrfconnect",`
`3`		`- "version": "4.3.0-pre2",`
	`3`	`+ "version": "4.3.0",`
`4`	`4`	`"description": "nRF Connect for Desktop",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`