Skip to content

Commit f214235

Browse files
committed
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.
1 parent 40d0c88 commit f214235

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

lib/vscode/build/lib/node.ts

+1-10
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,12 @@
66
import * as path from 'path';
77

88
const root = path.dirname(path.dirname(__dirname));
9-
<<<<<<< HEAD
109
const version = process.versions.node;
11-
const node = process.platform === 'win32' ? 'node.exe' : 'node';
12-
const nodePath = path.join(root, '.build', 'node', `v${version}`, `${process.platform}-${process.arch}`, node);
13-
14-
=======
15-
const yarnrcPath = path.join(root, 'remote', '.yarnrc');
16-
const yarnrc = fs.readFileSync(yarnrcPath, 'utf8');
17-
const version = /^target\s+"([^"]+)"$/m.exec(yarnrc)![1];
18-
1910
const platform = process.platform;
11+
2012
const arch = platform === 'darwin' ? 'x64' : process.arch;
2113

2214
const node = platform === 'win32' ? 'node.exe' : 'node';
2315
const nodePath = path.join(root, '.build', 'node', `v${version}`, `${platform}-${arch}`, node);
2416

25-
>>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
2617
console.log(nodePath);

0 commit comments

Comments
 (0)