From ce1a8c89dd97d6b2e086d84bf4b099d3a62ecad8 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 25 Feb 2021 11:57:35 -0700
Subject: [PATCH] fix: postinstall.js conflicts

Again, hope this was correct.

It looks like they moved around a few lines here.

If there are issues with dependencies not installing, check here.
---
 lib/vscode/build/npm/postinstall.js | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/lib/vscode/build/npm/postinstall.js b/lib/vscode/build/npm/postinstall.js
index 9bb6bdd2d..ac0c73968 100644
--- a/lib/vscode/build/npm/postinstall.js
+++ b/lib/vscode/build/npm/postinstall.js
@@ -38,13 +38,11 @@ function yarnInstall(location, opts) {
 
 for (let dir of dirs) {
 
-<<<<<<< HEAD
 // NOTE@coder: Skip these dependencies since we don't use them.
 // if (!(process.platform === 'win32' && (process.arch === 'arm64' || process.env['npm_config_arch'] === 'arm64'))) {
 // 	yarnInstall('remote'); // node modules used by vscode server
 // 	yarnInstall('remote/web'); // node modules used by vscode web
 // }
-=======
 	if (dir === '') {
 		// `yarn` already executed in root
 		continue;
@@ -54,7 +52,6 @@ for (let dir of dirs) {
 		// windows arm: do not execute `yarn` on remote folder
 		continue;
 	}
->>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
 
 	if (dir === 'build/lib/watch') {
 		// node modules for watching, specific to host node version, not electron
@@ -96,13 +93,4 @@ runtime "${runtime}"`;
 	yarnInstall(watchPath);
 }
 
-<<<<<<< HEAD
-yarnInstall(`build`); // node modules required for build
-// yarnInstall('test/automation'); // node modules required for smoketest
-// yarnInstall('test/smoke'); // node modules required for smoketest
-// yarnInstall('test/integration/browser'); // node modules required for integration
-yarnInstallBuildDependencies(); // node modules for watching, specific to host node version, not electron
-
-=======
->>>>>>> 89b6e0164fa770333755b11504e19a4232b1a2d4
 cp.execSync('git config pull.rebase true');