From 7e883c231921fe2681ef5268d1d0af7781122615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= Date: Wed, 13 Feb 2019 10:41:55 -0800 Subject: [PATCH] ci: corrected left over merge marker --- aio/tools/examples/run-example-e2e.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/aio/tools/examples/run-example-e2e.js b/aio/tools/examples/run-example-e2e.js index 4245002c2a..142bcdf580 100644 --- a/aio/tools/examples/run-example-e2e.js +++ b/aio/tools/examples/run-example-e2e.js @@ -223,11 +223,7 @@ function runE2eTestsCLI(appDir, outputFile) { console.log(`\n\n=========== Running aio example tests for: ${appDir}`); // `--no-webdriver-update` is needed to preserve the ChromeDriver version already installed. 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']}]; ->>>>>>> c8a0ce7388... test(ivy): enable more docs examples e2e tests (#28688) const e2eSpawnPromise = commands.reduce((prevSpawnPromise, {cmd, args}) => { return prevSpawnPromise.then(() => {