From cf61451d49f31bca85e1589347616e69a2373da6 Mon Sep 17 00:00:00 2001 From: Akash Satheesan Date: Wed, 5 May 2021 22:29:07 +0530 Subject: [PATCH] fix(lib/vscode): fix conflicts in githubServer.ts --- .../extensions/github-authentication/src/githubServer.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/vscode/extensions/github-authentication/src/githubServer.ts b/lib/vscode/extensions/github-authentication/src/githubServer.ts index cc811770..4fdafe0c 100644 --- a/lib/vscode/extensions/github-authentication/src/githubServer.ts +++ b/lib/vscode/extensions/github-authentication/src/githubServer.ts @@ -14,12 +14,9 @@ import { ExperimentationTelemetry } from './experimentationService'; const localize = nls.loadMessageBundle(); export const NETWORK_ERROR = 'network error'; -<<<<<<< HEAD +// NOTE@coder: use our own auth relay (the commented one is microsoft's, not ours) const AUTH_RELAY_SERVER = 'auth.code-server.dev'; -======= -const AUTH_RELAY_SERVER = 'vscode-auth.github.com'; // const AUTH_RELAY_STAGING_SERVER = 'client-auth-staging-14a768b.herokuapp.com'; ->>>>>>> 58ce849223667f77dc0d6d7658870ca3f815e17f class UriEventHandler extends vscode.EventEmitter implements vscode.UriHandler { public handleUri(uri: vscode.Uri) {