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

fix(lib/vscode): fix conflicts in githubServer.ts

This commit is contained in:
Akash Satheesan 2021-05-05 22:29:07 +05:30
parent 51dc9114ff
commit cf61451d49
No known key found for this signature in database
GPG Key ID: 93CBAADFEA703F8E
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/vscode/extensions/github-authentication/src/githubServer.ts
View File

@ -14,12 +14,9 @@ import { ExperimentationTelemetry } from './experimentationService';
const localize = nls.loadMessageBundle(); const localize = nls.loadMessageBundle();
export const NETWORK_ERROR = 'network error'; 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 = 'auth.code-server.dev';
=======
const AUTH_RELAY_SERVER = 'vscode-auth.github.com';
// const AUTH_RELAY_STAGING_SERVER = 'client-auth-staging-14a768b.herokuapp.com'; // const AUTH_RELAY_STAGING_SERVER = 'client-auth-staging-14a768b.herokuapp.com';
>>>>>>> 58ce849223667f77dc0d6d7658870ca3f815e17f
class UriEventHandler extends vscode.EventEmitter<vscode.Uri> implements vscode.UriHandler { class UriEventHandler extends vscode.EventEmitter<vscode.Uri> implements vscode.UriHandler {
public handleUri(uri: vscode.Uri) { public handleUri(uri: vscode.Uri) {