From b9526167253c50b64b4a4b29e5de0add32bffc34 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 25 Feb 2021 11:47:02 -0700
Subject: [PATCH] fix: resolve conflict browserSocketFactory

---
 .../src/vs/platform/remote/browser/browserSocketFactory.ts    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/vscode/src/vs/platform/remote/browser/browserSocketFactory.ts b/lib/vscode/src/vs/platform/remote/browser/browserSocketFactory.ts
index f7b449ea0..c65de8ad3 100644
--- a/lib/vscode/src/vs/platform/remote/browser/browserSocketFactory.ts
+++ b/lib/vscode/src/vs/platform/remote/browser/browserSocketFactory.ts
@@ -208,12 +208,8 @@ export class BrowserSocketFactory implements ISocketFactory {
 	}
 
 	connect(host: string, port: number, query: string, callback: IConnectCallback): void {
-<<<<<<< HEAD
 		// NOTE@coder: Modified to work against the current path.
 		const socket = this._webSocketFactory.create(`${window.location.protocol === 'https:' ? 'wss' : 'ws'}://${window.location.host}${window.location.pathname}?${query}&skipWebSocketFrames=false`);
-=======
-		const socket = this._webSocketFactory.create(`ws://${/:/.test(host) ? `[${host}]` : host}:${port}/?${query}&skipWebSocketFrames=false`);
->>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
 		const errorListener = socket.onError((err) => callback(err, undefined));
 		socket.onOpen(() => {
 			errorListener.dispose();