8000 14 · j143/github-pages-deploy-action@a283747 · GitHub
[go: up one dir, main page]
Skip to content

Commit a283747

Browse files
JamesIvesJamesIves
committed
14
1 parent 56ff596 commit a283747

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

‎.devcontainer/devcontainer.json

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,5 @@
11
// https://github.com/microsoft/vscode-dev-containers/tree/master/containers/typescript-node
22
{
3-
<<<<<<< Updated upstream
4-
"name": "Node.js & TypeScript",
5-
"build": {
6-
"dockerfile": "Dockerfile",
7-
"args": {
8-
"VARIANT": "12"
9-
}
10-
},
11-
"settings": {
12-
"terminal.integrated.shell.linux": "/bin/bash"
13-
},
14-
"extensions": ["dbaeumer.vscode-eslint"],
15-
"remoteUser": "node"
16-
}
17-
=======
183
"name": "Node.js & TypeScript",
194
"build": {
205
"dockerfile": "Dockerfile",
@@ -30,4 +15,3 @@
3015
],
3116
"remoteUser": "node"
3217
}
33-
>>>>>>> Stashed changes

0 commit comments

Comments
 (0)
0