summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-12-11 07:33:18 +0100
committerGitHub <noreply@github.com>2023-12-11 07:33:18 +0100
commitfedb2ee0c677dca23de24d9e70ff239e7556da28 (patch)
treeec9a275881adc2977c12b4bf7b1f8abb26402892
parente7cf5af4e558412d5cf1b8b6eca1ded1a264c6a8 (diff)
parent75e914c4dff0359988e5f500ae63f882ae6813e7 (diff)
downloadvyos-1x-fedb2ee0c677dca23de24d9e70ff239e7556da28.tar.gz
vyos-1x-fedb2ee0c677dca23de24d9e70ff239e7556da28.zip
Merge pull request #2609 from indrajitr/github-streamline-2
T5803: Migrate vscode settings to new value and clean up .gitattributes
-rw-r--r--.gitattributes5
-rw-r--r--.vscode/settings.json2
2 files changed, 1 insertions, 6 deletions
diff --git a/.gitattributes b/.gitattributes
index 624e00f03..1d79e0804 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -73,8 +73,3 @@
.gitkeep export-ignore
*.pyc binary export-ignore
*.pyo binary export-ignore
-
-#
-# Enable syntax highlighting for VSCode settings
-#
-.vscode/settings.json linguist-language=jsonc
diff --git a/.vscode/settings.json b/.vscode/settings.json
index ab3af6cf1..27ed4c296 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -10,7 +10,7 @@
"*.xml.in": "xml",
},
"[jinja]": {
- "editor.wordBasedSuggestions": false
+ "editor.wordBasedSuggestions": "off"
},
// https://code.visualstudio.com/docs/python/settings-reference
"python.analysis.extraPaths": [