mirror of
https://github.com/JamesIves/github-pages-deploy-action.git
synced 2023-12-15 20:03:39 +08:00
14
This commit is contained in:
parent
56ff5960ed
commit
a283747855
@ -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
|
|
||||||
|
Loading…
Reference in New Issue
Block a user