diff options
| author | QMK Bot <hello@qmk.fm> | 2021-04-25 20:46:54 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-04-25 20:46:54 +0000 |
| commit | 61a1915cce620cfa732389d0601ff30e34962e60 (patch) | |
| tree | da59ad5ee28995328d3affb8f9d0651788e0ae83 | |
| parent | 03db48af750a29b2548b2132ae5df66f4be7c5e0 (diff) | |
| parent | 417a07c22db39dc544f00f9a8b71a7fe1479981e (diff) | |
| download | qmk_firmware-61a1915cce620cfa732389d0601ff30e34962e60.tar.gz qmk_firmware-61a1915cce620cfa732389d0601ff30e34962e60.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 518b2df83..3592abcea 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -51,6 +51,7 @@ doxygen/ | |||
| 51 | .browse.VC.db* | 51 | .browse.VC.db* |
| 52 | *.stackdump | 52 | *.stackdump |
| 53 | # Let these ones be user specific, since we have so many different configurations | 53 | # Let these ones be user specific, since we have so many different configurations |
| 54 | *.code-workspace | ||
| 54 | .vscode/c_cpp_properties.json | 55 | .vscode/c_cpp_properties.json |
| 55 | .vscode/launch.json | 56 | .vscode/launch.json |
| 56 | .vscode/tasks.json | 57 | .vscode/tasks.json |