From d99bb3a87c1ea39141d15d182638ee3633ff60d7 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Thu, 18 Jan 2018 14:21:15 +0100
Subject: Fix merge conflicts

---
 packages/contracts/package.json | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'packages')

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",
-- 
cgit v1.2.3