cargdev/angular
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases Wiki Activity

ci: corrected left over merge marker

Browse Source
This commit is contained in:
Miško Hevery
2019-02-13 10:41:55 -08:00
parent 6a7fd70ddf
commit 7e883c2319
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
aio/tools/examples/run-example-e2e.js
View File

@ -223,11 +223,7 @@ function runE2eTestsCLI(appDir, outputFile) {
console.log(`\n\n=========== Running aio example tests for: ${appDir}`); console.log(`\n\n=========== Running aio example tests for: ${appDir}`);
// `--no-webdriver-update` is needed to preserve the ChromeDriver version already installed. // `--no-webdriver-update` is needed to preserve the ChromeDriver version already installed.
const config = loadExampleConfig(appDir); const config = loadExampleConfig(appDir);
<<<<<<< HEAD
const commands = config.e2e || [{cmd: 'yarn', args: ['e2e', '--no-webdriver-update']}];
=======
const commands = config.e2e || [{cmd: 'yarn', args: ['e2e', '--prod', '--no-webdriver-update']}]; const commands = config.e2e || [{cmd: 'yarn', args: ['e2e', '--prod', '--no-webdriver-update']}];
>>>>>>> c8a0ce7388... test(ivy): enable more docs examples e2e tests (#28688)
const e2eSpawnPromise = commands.reduce((prevSpawnPromise, {cmd, args}) => { const e2eSpawnPromise = commands.reduce((prevSpawnPromise, {cmd, args}) => {
return prevSpawnPromise.then(() => { return prevSpawnPromise.then(() => {