mirror of
https://github.com/danog/code-server.git
synced 2024-11-26 20:34:56 +01:00
Fix my bad conflict resolution from the github ui
This commit is contained in:
parent
75c8fdeed2
commit
617cd38c71
@ -3,7 +3,7 @@ import * as cp from "child_process"
|
||||
import { promises as fs } from "fs"
|
||||
import http from "http"
|
||||
import * as path from "path"
|
||||
import { CliMessage } from "../../lib/vscode/src/vs/server/ipc"
|
||||
import { CliMessage, OpenCommandPipeArgs } from "../../lib/vscode/src/vs/server/ipc"
|
||||
import { plural } from "../common/util"
|
||||
import { HealthHttpProvider } from "./app/health"
|
||||
import { LoginHttpProvider } from "./app/login"
|
||||
|
Loading…
Reference in New Issue
Block a user