1
0
mirror of https://git.tuxpa.in/a/code-server.git synced 2024-12-26 04:14:29 +00:00

Fix my bad conflict resolution from the github ui

This commit is contained in:
Asher 2020-08-31 11:10:12 -05:00
parent 75c8fdeed2
commit 617cd38c71
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A

View File

@ -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"