From 424a3b95aaf9976d0a868d23b150417ecbbd6fd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= Date: Wed, 13 Feb 2019 10:50:36 -0800 Subject: [PATCH] ci: corrected left over merge marker --- aio/tools/examples/run-example-e2e.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/aio/tools/examples/run-example-e2e.js b/aio/tools/examples/run-example-e2e.js index 142bcdf580..7ae43f4e53 100644 --- a/aio/tools/examples/run-example-e2e.js +++ b/aio/tools/examples/run-example-e2e.js @@ -310,19 +310,11 @@ function getE2eSpecs(basePath, filter) { // Find all e2e specs in a given example folder. function getE2eSpecsFor(basePath, specFile, filter) { // Only get spec file at the example root. -<<<<<<< HEAD - const e2eSpecGlob = `${filter ? ` * ${filter} * ` : '*'}/${specFile}`; - return globby(e2eSpecGlob, {cwd: basePath, nodir: true}) - .then( - paths => paths.filter(file => !IGNORED_EXAMPLES.some(ignored => file.startsWith(ignored))) - .map(file => path.join(basePath, file))); -======= const e2eSpecGlob = `${filter ? '*' + filter + '*' : '*'}/${specFile}`; return globby(e2eSpecGlob, {cwd: basePath, nodir: true}) .then( paths => paths.filter(file => !IGNORED_EXAMPLES.some(ignored => file.startsWith(ignored))) .map(file => path.join(basePath, file))); ->>>>>>> c8a0ce7388... test(ivy): enable more docs examples e2e tests (#28688) } // Load configuration for an example. Used for SystemJS