resolved.

qcif · Jun 2, 2018 · 5abb466 · 5abb466
1 parent 192567a
commit 5abb466
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -26,10 +26,6 @@
     "unit": "karma start test/unit/karma.conf.js",
     "e2e": "yarn run pack && (yarn run cucumber:postpack:impl || yarn -v) && yarn run cucumber:report",
     "e2e:dev": "(yarn run cucumber:postpack:dev || yarn -v) && yarn run cucumber:report",
-=======
-    "e2e": "yarn run pack && (yarn run cucumber:postpack:impl || true) && yarn run cucumber:report",
-    "e2e:dev": "(yarn run cucumber:postpack:dev || true) &&  yarn run cucumber:report",
->>>>>>> 2107affe02974388d9ea6cc752a880851d534d36
     "cucumber:postpack": "cross-env BABEL_ENV=test nyc cucumber-js --require-module babel-core/register test/features -f json:test/cucumber_report.json",
     "cucumber:postpack:dev": "cross-env BABEL_ENV=test nyc cucumber-js --require-module babel-core/register --tags @dev test/features -f json:test/cucumber_report.json",
     "cucumber:postpack:impl": "cross-env BABEL_ENV=test nyc cucumber-js --require-module babel-core/register --tags @impl test/features -f json:test/cucumber_report.json",