aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-06-19 18:56:22 +0800
committerFabio Berger <me@fabioberger.com>2018-06-19 18:56:22 +0800
commit17d49067e9cefc61fb906e1118dac1d85f6ee69b (patch)
tree92c8396a1ea6ea416a0756a5e92e9b49e4e30443 /packages
parenta96abe24227b54b7a038278c432b7bf8a70c22a4 (diff)
downloaddexon-sol-tools-17d49067e9cefc61fb906e1118dac1d85f6ee69b.tar
dexon-sol-tools-17d49067e9cefc61fb906e1118dac1d85f6ee69b.tar.gz
dexon-sol-tools-17d49067e9cefc61fb906e1118dac1d85f6ee69b.tar.bz2
dexon-sol-tools-17d49067e9cefc61fb906e1118dac1d85f6ee69b.tar.lz
dexon-sol-tools-17d49067e9cefc61fb906e1118dac1d85f6ee69b.tar.xz
dexon-sol-tools-17d49067e9cefc61fb906e1118dac1d85f6ee69b.tar.zst
dexon-sol-tools-17d49067e9cefc61fb906e1118dac1d85f6ee69b.zip
Fix missed merge conflicts
Diffstat (limited to 'packages')
-rw-r--r--packages/tslint-config/CHANGELOG.json3
-rw-r--r--packages/web3-wrapper/CHANGELOG.json3
-rw-r--r--packages/website/md/docs/sol_cov/usage.md8
3 files changed, 0 insertions, 14 deletions
diff --git a/packages/tslint-config/CHANGELOG.json b/packages/tslint-config/CHANGELOG.json
index 6ae195ae7..ffb0c4e81 100644
--- a/packages/tslint-config/CHANGELOG.json
+++ b/packages/tslint-config/CHANGELOG.json
@@ -1,7 +1,5 @@
[
{
-<<<<<<< HEAD
-=======
"timestamp": 1529397769,
"version": "0.4.20",
"changes": [
@@ -20,7 +18,6 @@
"timestamp": 1527810075
},
{
->>>>>>> 40a061a5... Updated CHANGELOGS
"timestamp": 1527009133,
"version": "0.4.18",
"changes": [
diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json
index 1f1c8e2c0..624ad7151 100644
--- a/packages/web3-wrapper/CHANGELOG.json
+++ b/packages/web3-wrapper/CHANGELOG.json
@@ -1,7 +1,5 @@
[
{
-<<<<<<< HEAD
-=======
"timestamp": 1529397769,
"version": "0.7.1",
"changes": [
@@ -12,7 +10,6 @@
},
{
"timestamp": 1528070400,
->>>>>>> 40a061a5... Updated CHANGELOGS
"version": "0.7.0",
"changes": [
{
diff --git a/packages/website/md/docs/sol_cov/usage.md b/packages/website/md/docs/sol_cov/usage.md
index 59638f611..433cfad96 100644
--- a/packages/website/md/docs/sol_cov/usage.md
+++ b/packages/website/md/docs/sol_cov/usage.md
@@ -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.
```typescript
-<<<<<<< HEAD
-import { CoverageSubprovider } from '@0xproject/sol-cov';
-=======
import { SolCompilerArtifactsAdapter } from '@0xproject/sol-cov';
const artifactsPath = 'src/artifacts';
const contractsPath = 'src/contracts';
@@ -42,7 +39,6 @@ Look at the code of the two adapters above for examples.
```typescript
import { CoverageSubprovider } from '@0xproject/sol-cov';
import ProviderEngine = require('web3-provider-engine');
->>>>>>> Improve sol-cov docs
const provider = new ProviderEngine();
@@ -51,12 +47,8 @@ const contractsPath = 'src/contracts';
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.
const defaultFromAddress = '0x5409ed021d9299bf6814279a6a1411a7e866a631';
-<<<<<<< HEAD
-const coverageSubprovider = new CoverageSubprovider(artifactsPath, contractsPath, defaultFromAddress);
-=======
const isVerbose = true;
const coverageSubprovider = new CoverageSubprovider(artifactsAdapter, defaultFromAddress, isVerbose);
->>>>>>> Improve sol-cov docs
provider.addProvider(coverageSubprovider);
```