crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Leonid Logvinov
2018-01-18 14:21:15 +01:00
parent 4b9501318d
commit d99bb3a87c
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/contracts/package.json
View File

@@ -15,13 +15,7 @@
"clean": "rm -rf ./lib", "clean": "rm -rf ./lib",
"migrate": "node ../deployer/lib/cli.js migrate", "migrate": "node ../deployer/lib/cli.js migrate",
"lint": "tslint --project . 'migrations/**/*.ts' 'test/**/*.ts' 'util/**/*.ts' 'deploy/**/*.ts'", "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" "test:circleci": "yarn test"
>>>>>>> Move deployer to a separate package
}, },
"repository": { "repository": {
"type": "git", "type": "git",