diff options
author | Christian Breunig <christian@breunig.cc> | 2023-12-13 15:20:49 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-13 15:20:49 +0100 |
commit | 000d0a384f99cf71056c4639cbbc3be6bb2cf425 (patch) | |
tree | 9b25af65bd730e7c6b4102b3c4e9a22ff99a5bf0 | |
parent | fd74eb2e388308b9bd50ccc4236d53baa53a8da2 (diff) | |
parent | abcea5f2783a8feb2331aacb3b6506c1514be506 (diff) | |
download | vyos-1x-000d0a384f99cf71056c4639cbbc3be6bb2cf425.tar.gz vyos-1x-000d0a384f99cf71056c4639cbbc3be6bb2cf425.zip |
Merge pull request #2610 from vyos/mergify/bp/sagitta/pr-2609
T5803: Migrate vscode settings to new value and clean up .gitattributes (backport #2609)
-rw-r--r-- | .gitattributes | 5 | ||||
-rw-r--r-- | .vscode/settings.json | 2 |
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": [ |