From 6a113c7c2c25a380adddc47ef10ee980110d9820 Mon Sep 17 00:00:00 2001
From: Aaron Powell <me@aaron-powell.com>
Date: Wed, 3 Jul 2019 14:31:22 +1000
Subject: [PATCH] cleaning up a merge issue

---
 src/extension.ts          | 6 +++---
 src/services/liveShare.ts | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/extension.ts b/src/extension.ts
index 2a07943..147cfb8 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -20,8 +20,8 @@ async function activateProfile(
   await settingsHelper.updateUserSettings(profileSettings);
 
   let extensions = config.getProfileExtensions(profile);
-  await extensionsHelper.installExtensions(extensions);
-  await extensionsHelper.removeExtensions(extensions);
+  await extensionsHelper.installExtensions(extensions, logger);
+  await extensionsHelper.removeExtensions(extensions, logger);
 
   msg.dispose();
 
@@ -178,7 +178,7 @@ export async function activate(context: vscode.ExtensionContext) {
     )
   );
 
-  liveShare.initialize(context, config, (profile: string) => {
+  liveShare.initialize(config, (profile: string) => {
     activateProfile(profile, config, settingsHelper, extensionsHelper);
   });
 }
diff --git a/src/services/liveShare.ts b/src/services/liveShare.ts
index 3768a9c..41da018 100644
--- a/src/services/liveShare.ts
+++ b/src/services/liveShare.ts
@@ -1,13 +1,11 @@
-import * as vscode from "vscode";
 import * as vsls from "vsls";
 import Config from "./config";
 
 export async function initialize(
-    context: vscode.ExtensionContext,
     config: Config,
     activateProfileHandler: (profile: string) => void
 ) {
-    // Check to see if the end-user has the Live Share 
+    // Check to see if the end-user has the Live Share
     // extension installed, and if not, exit early.
     const liveShare = await vsls.getApi();
     if (!liveShare) {