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

Fix missed merge conflicts

Browse Source
This commit is contained in:
Fabio Berger 2018-06-19 12:56:22 +02:00
parent a96abe2422
commit 17d49067e9
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/tslint-config/CHANGELOG.json
View File

@ -1,7 +1,5 @@
[ [
{ {
<<<<<<< HEAD
=======
"timestamp": 1529397769, "timestamp": 1529397769,
"version": "0.4.20", "version": "0.4.20",
"changes": [ "changes": [
@ -20,7 +18,6 @@
"timestamp": 1527810075 "timestamp": 1527810075
}, },
{ {
>>>>>>> 40a061a5... Updated CHANGELOGS
"timestamp": 1527009133, "timestamp": 1527009133,
"version": "0.4.18", "version": "0.4.18",
"changes": [ "changes": [

3
packages/web3-wrapper/CHANGELOG.json
View File

@ -1,7 +1,5 @@
[ [
{ {
<<<<<<< HEAD
=======
"timestamp": 1529397769, "timestamp": 1529397769,
"version": "0.7.1", "version": "0.7.1",
"changes": [ "changes": [
@ -12,7 +10,6 @@
}, },
{ {
"timestamp": 1528070400, "timestamp": 1528070400,
>>>>>>> 40a061a5... Updated CHANGELOGS
"version": "0.7.0", "version": "0.7.0",
"changes": [ "changes": [
{ {

8
packages/website/md/docs/sol_cov/usage.md
View File

@ -11,9 +11,6 @@ In order to use `CoverageSubprovider` with your favorite framework you need to p
If you are generating your artifacts with [@0xproject/sol-compiler](LINK) you can use the `SolCompilerArtifactsAdapter` we've implemented for you. If you are generating your artifacts with [@0xproject/sol-compiler](LINK) you can use the `SolCompilerArtifactsAdapter` we've implemented for you.
```typescript ```typescript
<<<<<<< HEAD
import { CoverageSubprovider } from '@0xproject/sol-cov';
=======
import { SolCompilerArtifactsAdapter } from '@0xproject/sol-cov'; import { SolCompilerArtifactsAdapter } from '@0xproject/sol-cov';
const artifactsPath = 'src/artifacts'; const artifactsPath = 'src/artifacts';
const contractsPath = 'src/contracts'; const contractsPath = 'src/contracts';
@ -42,7 +39,6 @@ Look at the code of the two adapters above for examples.
```typescript ```typescript
import { CoverageSubprovider } from '@0xproject/sol-cov'; import { CoverageSubprovider } from '@0xproject/sol-cov';
import ProviderEngine = require('web3-provider-engine'); import ProviderEngine = require('web3-provider-engine');
>>>>>>> Improve sol-cov docs
const provider = new ProviderEngine(); const provider = new ProviderEngine();
@ -51,12 +47,8 @@ const contractsPath = 'src/contracts';
const networkId = 50; const networkId = 50;
// Some calls might not have `from` address specified. Nevertheless - transactions need to be submitted from an address with at least some funds. defaultFromAddress is the address that will be used to submit those calls as transactions from. // Some calls might not have `from` address specified. Nevertheless - transactions need to be submitted from an address with at least some funds. defaultFromAddress is the address that will be used to submit those calls as transactions from.
const defaultFromAddress = '0x5409ed021d9299bf6814279a6a1411a7e866a631'; const defaultFromAddress = '0x5409ed021d9299bf6814279a6a1411a7e866a631';
<<<<<<< HEAD
const coverageSubprovider = new CoverageSubprovider(artifactsPath, contractsPath, defaultFromAddress);
=======
const isVerbose = true; const isVerbose = true;
const coverageSubprovider = new CoverageSubprovider(artifactsAdapter, defaultFromAddress, isVerbose); const coverageSubprovider = new CoverageSubprovider(artifactsAdapter, defaultFromAddress, isVerbose);
>>>>>>> Improve sol-cov docs
provider.addProvider(coverageSubprovider); provider.addProvider(coverageSubprovider);
``` ```