This commit is contained in:
James Ives 2022-01-06 09:56:00 -05:00
parent 56ff5960ed
commit a283747855

View File

@ -1,20 +1,5 @@
// https://github.com/microsoft/vscode-dev-containers/tree/master/containers/typescript-node // https://github.com/microsoft/vscode-dev-containers/tree/master/containers/typescript-node
{ {
<<<<<<< Updated upstream
"name": "Node.js & TypeScript",
"build": {
"dockerfile": "Dockerfile",
"args": {
"VARIANT": "12"
}
},
"settings": {
"terminal.integrated.shell.linux": "/bin/bash"
},
"extensions": ["dbaeumer.vscode-eslint"],
"remoteUser": "node"
}
=======
"name": "Node.js & TypeScript", "name": "Node.js & TypeScript",
"build": { "build": {
"dockerfile": "Dockerfile", "dockerfile": "Dockerfile",
@ -30,4 +15,3 @@
], ],
"remoteUser": "node" "remoteUser": "node"
} }
>>>>>>> Stashed changes