diff options
| author | Jeremy Cowgar <jeremy@cowgar.com> | 2017-09-20 13:38:27 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-09-21 00:15:53 -0400 |
| commit | 064f682103dff1bd7b1dfea4d44ca34827d061a1 (patch) | |
| tree | 95d3fd57eee2946102b9a02f7c722a7ae9f4917f | |
| parent | 32d6a8b7ecdc653bd032e2bd32cfb8bb3183c904 (diff) | |
Instruct VSCode to indent using spaces, also ignore two temp files created by VSCode.
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | .vscode/settings.json | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index e766619098..e77127268b 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -39,6 +39,8 @@ util/Win_Check_Output.txt | |||
| 39 | # Let these ones be user specific, since we have so many different configurations | 39 | # Let these ones be user specific, since we have so many different configurations |
| 40 | .vscode/launch.json | 40 | .vscode/launch.json |
| 41 | .vscode/tasks.json | 41 | .vscode/tasks.json |
| 42 | .vscode/last.sql | ||
| 43 | .vscode/temp.sql | ||
| 42 | .stfolder | 44 | .stfolder |
| 43 | 45 | ||
| 44 | # ignore image files | 46 | # ignore image files |
| @@ -47,7 +49,7 @@ util/Win_Check_Output.txt | |||
| 47 | *.gif | 49 | *.gif |
| 48 | 50 | ||
| 49 | # Do not ignore MiniDox left/right hand eeprom files | 51 | # Do not ignore MiniDox left/right hand eeprom files |
| 50 | !keyboards/minidox/*.eep | 52 | !keyboards/minidox/*.eep |
| 51 | 53 | ||
| 52 | # things travis sees | 54 | # things travis sees |
| 53 | secrets.tar | 55 | secrets.tar |
diff --git a/.vscode/settings.json b/.vscode/settings.json index be0b85b78f..afe8341d0e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | // Place your settings in this file to overwrite default and user settings. | 1 | // Place your settings in this file to overwrite default and user settings. |
| 2 | { | 2 | { |
| 3 | // Unofficially, QMK uses spaces for indentation | ||
| 4 | "editor.insertSpaces": true, | ||
| 3 | // Configure glob patterns for excluding files and folders. | 5 | // Configure glob patterns for excluding files and folders. |
| 4 | "files.exclude": { | 6 | "files.exclude": { |
| 5 | "**/.build": true, | 7 | "**/.build": true, |
