Fix merge conflicts

2018-01-18 14:21:15 +01:00
parent 4b9501318d
commit d99bb3a87c
1 changed files with 0 additions and 6 deletions
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -15,13 +15,7 @@
        "clean": "rm -rf ./lib",
        "migrate": "node ../deployer/lib/cli.js migrate",
        "lint": "tslint --project . 'migrations/**/*.ts' 'test/**/*.ts' 'util/**/*.ts' 'deploy/**/*.ts'",
-<<<<<<< HEAD
-        "test:circleci:contracts": "yarn test",
-        "test:circleci:deployer": "yarn test:deployer",
-        "test:deployer": "npm run build; mocha lib/deploy/test/*_test.js"
-=======
        "test:circleci": "yarn test"
->>>>>>> Move deployer to a separate package
    },
    "repository": {
        "type": "git",