From f214235e2d88095490706c5d6fb9fec046990eb1 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 25 Feb 2021 12:08:12 -0700
Subject: [PATCH] fix: resolve conflicts in build/lib/node.ts

It looks like they added a few more variables and cleaned this file up.

I removed the yarn and yarnRc stuff. Hope that doesn't break anything.
---
 lib/vscode/build/lib/node.ts | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/lib/vscode/build/lib/node.ts b/lib/vscode/build/lib/node.ts
index 93b946f93..20389c694 100644
--- a/lib/vscode/build/lib/node.ts
+++ b/lib/vscode/build/lib/node.ts
@@ -6,21 +6,12 @@
 import * as path from 'path';
 
 const root = path.dirname(path.dirname(__dirname));
-<<<<<<< HEAD
 const version = process.versions.node;
-const node = process.platform === 'win32' ? 'node.exe' : 'node';
-const nodePath = path.join(root, '.build', 'node', `v${version}`, `${process.platform}-${process.arch}`, node);
-
-=======
-const yarnrcPath = path.join(root, 'remote', '.yarnrc');
-const yarnrc = fs.readFileSync(yarnrcPath, 'utf8');
-const version = /^target\s+"([^"]+)"$/m.exec(yarnrc)![1];
-
 const platform = process.platform;
+
 const arch = platform === 'darwin' ? 'x64' : process.arch;
 
 const node = platform === 'win32' ? 'node.exe' : 'node';
 const nodePath = path.join(root, '.build', 'node', `v${version}`, `${platform}-${arch}`, node);
 
->>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
 console.log(nodePath);