Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
8 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js | ||
index ef8fa4a47f66..7b8b710636a7 100644 | ||
index 18ccef884a9d..61acb0a4d10b 100644 | ||
--- a/build/npm/postinstall.js | ||
+++ b/build/npm/postinstall.js | ||
@@ -73,5 +73,3 @@ 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 | ||
@@ -87,5 +87,3 @@ runtime "${runtime}"`; | ||
fs.writeFileSync(yarnrcPath, yarnrc, 'utf8'); | ||
yarnInstall(watchPath); | ||
} | ||
- | ||
-cp.execSync('git config pull.rebase true'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters