From 4ab306efebfd0a09d6d688af3d1b40024ca28c7b Mon Sep 17 00:00:00 2001
From: Akash Satheesan <akash@coder.com>
Date: Fri, 9 Apr 2021 12:09:36 +0530
Subject: [PATCH] fix(lib/vscode): fix conflicts in
 workbench/workbench.web.main.ts

---
 lib/vscode/src/vs/workbench/workbench.web.main.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/vscode/src/vs/workbench/workbench.web.main.ts b/lib/vscode/src/vs/workbench/workbench.web.main.ts
index a6273d43..9c8fbedb 100644
--- a/lib/vscode/src/vs/workbench/workbench.web.main.ts
+++ b/lib/vscode/src/vs/workbench/workbench.web.main.ts
@@ -42,13 +42,8 @@ import 'vs/workbench/services/keybinding/browser/keyboardLayoutService';
 import 'vs/workbench/services/extensions/browser/extensionService';
 import 'vs/workbench/services/extensionManagement/common/extensionManagementServerService';
 import 'vs/workbench/services/extensionManagement/browser/extensionUrlTrustService';
-<<<<<<< HEAD
 // NOTE@coder: We send it all to the server side to be processed there instead.
 // import 'vs/workbench/services/telemetry/browser/telemetryService';
-import 'vs/workbench/services/configurationResolver/browser/configurationResolverService';
-=======
-import 'vs/workbench/services/telemetry/browser/telemetryService';
->>>>>>> 801aed93200dc0ccf325a09089c911e8e2b612d0
 import 'vs/workbench/services/credentials/browser/credentialsService';
 import 'vs/workbench/services/url/browser/urlService';
 import 'vs/workbench/services/update/browser/updateService';