vm: fix merge conflict in package.json

ethereumjs · Sep 10, 2020 · bd9ce1d · bd9ce1d · github-actions · Sep 10, 2020
1 parent af344cb
commit bd9ce1d
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/packages/vm/package.json b/packages/vm/package.json
@@ -21,13 +21,8 @@
     "test:state:slow": "npm run test:state -- --runSkipped=slow",
     "test:buildIntegrity": "npm run test:state -- --test='stackOverflow'",
     "test:blockchain": "node -r ts-node/register --stack-size=1500 ./tests/tester --blockchain",
-<<<<<<< HEAD
     "test:blockchain:allForks": "echo 'Chainstart Homestead dao TangerineWhistle SpuriousDragon Byzantium Constantinople Petersburg Istanbul MuirGlacier Berlin' | xargs -n1 | xargs -I v1 node -r ts-node/register --stack-size=1500 ./tests/tester --blockchain --fork=v1",
     "test:API": "tape -r ts-node/register --stack-size=1500 ./tests/api/**/*.js",
-=======
-    "test:blockchain:allForks": "echo 'Chainstart Homestead dao TangerineWhistle SpuriousDragon Byzantium Constantinople Petersburg Istanbul MuirGlacier' | xargs -n1 | xargs -I v1 node -r ts-node/register --stack-size=1500 ./tests/tester --blockchain --fork=v1",
-    "test:API": "tape -r ts-node/register --stack-size=1500 './tests/api/**/*.js'",
->>>>>>> vm, block: fix VM StateTest runner, block hardforkByBlockNumber typo correction
     "test:API:browser": "npm run build && karma start karma.conf.js",
     "test": "echo \"[INFO] Generic test cmd not used. See package.json for more specific test run cmds.\"",
     "tslint": "ethereumjs-config-tslint",