File tree Expand file tree Collapse file tree 1 file changed +0
-12
lines changed Expand file tree Collapse file tree 1 file changed +0
-12
lines changed Original file line number Diff line number Diff line change @@ -38,13 +38,11 @@ function yarnInstall(location, opts) {
38
38
39
39
for ( let dir of dirs ) {
40
40
41
- < << << << HEAD
42
41
// NOTE@coder : Skip these dependencies since we don't use them.
43
42
// if (!(process.platform === 'win32' && (process.arch === 'arm64' || process.env['npm_config_arch'] === 'arm64'))) {
44
43
// yarnInstall('remote'); // node modules used by vscode server
45
44
// yarnInstall('remote/web'); // node modules used by vscode web
46
45
// }
47
- = === ===
48
46
if ( dir === '' ) {
49
47
// `yarn` already executed in root
50
48
continue ;
@@ -54,7 +52,6 @@ for (let dir of dirs) {
54
52
// windows arm: do not execute `yarn` on remote folder
55
53
continue ;
56
54
}
57
- > >>> >>> 89 b6e0164fa770333755b11504e19a4232b1a2d4
58
55
59
56
if ( dir === 'build/lib/watch' ) {
60
57
// node modules for watching, specific to host node version, not electron
@@ -96,13 +93,4 @@ runtime "${runtime}"`;
96
93
yarnInstall ( watchPath ) ;
97
94
}
98
95
99
- << < << << HEAD
100
- yarnInstall ( `build` ) ; // node modules required for build
101
- // yarnInstall('test/automation'); // node modules required for smoketest
102
- // yarnInstall('test/smoke'); // node modules required for smoketest
103
- // yarnInstall('test/integration/browser'); // node modules required for integration
104
- yarnInstallBuildDependencies ( ) ; // node modules for watching, specific to host node version, not electron
105
-
106
- = === ===
107
- >>> >>> > 89 b6e0164fa770333755b11504e19a4232b1a2d4
108
96
cp . execSync ( 'git config pull.rebase true' ) ;
You can’t perform that action at this time.
0 commit comments