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

@0x:contracts-integrations Fixed package after rebase

Browse Source
This commit is contained in:
Alex Towle
2019-10-22 13:15:01 -07:00
parent f5a6b84fa3
commit 3a1fc9ee5f
4 changed files with 7 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/integrations/test/framework-unit-tests/deployment_manager_test.ts
View File

@@ -2,11 +2,7 @@ import { Authorizable, Ownable } from '@0x/contracts-exchange';
import { constants as stakingConstants } from '@0x/contracts-staking';
import { blockchainTests, expect } from '@0x/contracts-test-utils';
<<<<<<< HEAD:contracts/integrations/test/utils/deployment_manager_test.ts
import { DeploymentManager } from './deployment_mananger';
=======
import { DeploymentManager } from '../utils/deployment_manager';
>>>>>>> `@0x:contracts-integrations` Added unit tests for FunctionAssertion:contracts/integrations/test/framework-unit-tests/deployment_manager_test.ts
blockchainTests('Deployment Manager', env => {
let owner: string;