|
21 | 21 | "editor.defaultFormatter": "ms-python.black-formatter", |
22 | 22 | "editor.formatOnSave": true |
23 | 23 | }, |
| 24 | + "git.mergeEditor": true, |
24 | 25 | "markdown-preview-github-styles.colorTheme": "light", |
25 | 26 | "makefile.extensionOutputFolder": "/tmp", |
26 | 27 | "python.testing.unittestEnabled": false, |
|
45 | 46 | "extensions": [ |
46 | 47 | "ms-python.python", |
47 | 48 | "ms-python.vscode-pylance", |
48 | | - "VisualStudioExptTeam.vscodeintellicode", |
49 | 49 | "ms-python.pylint", |
50 | 50 | "ms-python.flake8", |
51 | 51 | "ms-python.black-formatter", |
52 | 52 | "ms-vscode.makefile-tools", |
53 | | - "cstrap.flask-snippets", |
54 | | - "wholroyd.jinja", |
55 | | - "ms-vscode.makefile-tools", |
56 | 53 | "yzhang.markdown-all-in-one", |
| 54 | + "DavidAnson.vscode-markdownlint", |
57 | 55 | "bierner.github-markdown-preview", |
58 | 56 | "hnw.vscode-auto-open-markdown-preview", |
59 | | - "davidanson.vscode-markdownlint", |
60 | 57 | "bierner.markdown-preview-github-styles", |
61 | 58 | "tamasfe.even-better-toml", |
62 | 59 | "donjayamanne.githistory", |
63 | 60 | "GitHub.vscode-pull-request-github", |
| 61 | + "github.vscode-github-actions", |
64 | 62 | "hbenl.vscode-test-explorer", |
65 | 63 | "LittleFoxTeam.vscode-python-test-adapter", |
66 | 64 | "njpwerner.autodocstring", |
67 | 65 | "wholroyd.jinja", |
68 | 66 | "redhat.vscode-yaml", |
69 | | - "rangav.vscode-thunder-client", |
70 | 67 | "redhat.fabric8-analytics", |
71 | | - "streetsidesoftware.code-spell-checker", |
72 | 68 | "ms-azuretools.vscode-docker", |
73 | 69 | "ms-kubernetes-tools.vscode-kubernetes-tools", |
74 | | - "github.vscode-github-actions", |
| 70 | + "inercia.vscode-k3d", |
| 71 | + "rangav.vscode-thunder-client", |
75 | 72 | "alexkrechik.cucumberautocomplete", |
76 | 73 | "Zignd.html-css-class-completion", |
77 | | - "streetsidesoftware.code-spell-checker", |
| 74 | + "streetsidesoftware.code-spell-checker", |
78 | 75 | "bbenoist.vagrant" |
79 | 76 | ] |
80 | 77 | } |
|
0 commit comments