a
/
code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/node/entry.ts
View File

@ -3,7 +3,7 @@ import * as cp from "child_process"
import { promises as fs } from "fs" import { promises as fs } from "fs"
import http from "http" import http from "http"
import * as path from "path" 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 { plural } from "../common/util"
import { HealthHttpProvider } from "./app/health" import { HealthHttpProvider } from "./app/health"
import { LoginHttpProvider } from "./app/login" import { LoginHttpProvider } from "./app/login"