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

fix(lib/vscode): fix merge conflicts in localizationsService.ts

Browse Source
This commit is contained in:
Akash Satheesan
2021-04-09 17:49:14 +05:30
parent 448ba0ccf2
commit 5e63b7f53c
2 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/vscode/src/vs/server/browser/client.ts
View File

@@ -5,7 +5,6 @@ import { localize } from 'vs/nls';
import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
import { ILogService } from 'vs/platform/log/common/log';
import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
import { Registry } from 'vs/platform/registry/common/platform';
@@ -13,7 +12,6 @@ import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storag
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { TelemetryChannelClient } from 'vs/server/common/telemetry';
import 'vs/workbench/contrib/localizations/browser/localizations.contribution';
import { LocalizationsService } from 'vs/workbench/services/localizations/electron-sandbox/localizationsService';
import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
class TelemetryService extends TelemetryChannelClient {
@@ -60,7 +58,6 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfigurat
}
});
registerSingleton(ILocalizationsService, LocalizationsService);
registerSingleton(ITelemetryService, TelemetryService);
/**