From 262963c9ecda02b351e75e8ba4113c0f6cc84ca4 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 25 Feb 2021 11:42:42 -0700
Subject: [PATCH] fix: resolve conflict in extensionHostProcessSetup.ts

From what I can tell, they added these `performance.mark` calls. Not sure
exactly what they do, but my guess is they're supposed to help with measuring
extension performance?
---
 .../services/extensions/node/extensionHostProcessSetup.ts      | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/vscode/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts b/lib/vscode/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts
index c81a9cfb..ead1695b 100644
--- a/lib/vscode/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts
+++ b/lib/vscode/src/vs/workbench/services/extensions/node/extensionHostProcessSetup.ts
@@ -313,12 +313,9 @@ function connectToRenderer(protocol: IMessagePassingProtocol): Promise<IRenderer
 }
 
 export async function startExtensionHostProcess(): Promise<void> {
-<<<<<<< HEAD
 	proxyAgent.monkeyPatch(true);
 
-=======
 	performance.mark(`code/extHost/willConnectToRenderer`);
->>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
 	const protocol = await createExtHostProtocol();
 	performance.mark(`code/extHost/didConnectToRenderer`);
 	const renderer = await connectToRenderer(protocol);