Fix conflicts

Signed-off-by: Ayane Satomi <chinodesuuu@gmail.com>
This commit is contained in:
Ayane Satomi 2023-09-11 03:17:12 +00:00
commit 5e71e87854
2 changed files with 15 additions and 9 deletions

View file

@ -7,7 +7,10 @@
"deno task start": { "deno task start": {
"name": "deno task start", "name": "deno task start",
"command": "deno task start", "command": "deno task start",
"runAtStart": true "runAtStart": true,
"preview": {
"port": 8000
}
} }
} }
} }

View file

@ -6,14 +6,17 @@
"ghcr.io/devcontainers/features/common-utils:2": { "ghcr.io/devcontainers/features/common-utils:2": {
"nonFreePackages": true, "nonFreePackages": true,
"upgradePackages": true "upgradePackages": true
},
"ghcr.io/nmemoto/devcontainer-features/deno:1": {
"version": "latest"
} }
}, },
"customizations": { "customizations": {
"vscode": { "vscode": {
"extensions": [ "extensions": [
"sastan.twind-intellisense", "sastan.twind-intellisense",
"denoland.vscode-deno" "denoland.vscode-deno"
] ]
} }
} }
} }