diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-01-18 21:21:15 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-01-18 21:21:15 +0800 |
| commit | d99bb3a87c1ea39141d15d182638ee3633ff60d7 (patch) | |
| tree | 272eab7a6957bd23affb8321e15d878151711a5f | |
| parent | 4b9501318d8933f949fa0f87956e9cf5298d5726 (diff) | |
| download | dexon-0x-contracts-d99bb3a87c1ea39141d15d182638ee3633ff60d7.tar.gz dexon-0x-contracts-d99bb3a87c1ea39141d15d182638ee3633ff60d7.tar.zst dexon-0x-contracts-d99bb3a87c1ea39141d15d182638ee3633ff60d7.zip | |
Fix merge conflicts
| -rw-r--r-- | packages/contracts/package.json | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 7b8f219e3..9daa2c4f2 100644 --- 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", |