diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-06-19 18:56:22 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-06-19 18:56:22 +0800 |
| commit | 17d49067e9cefc61fb906e1118dac1d85f6ee69b (patch) | |
| tree | 92c8396a1ea6ea416a0756a5e92e9b49e4e30443 /packages/web3-wrapper | |
| parent | a96abe24227b54b7a038278c432b7bf8a70c22a4 (diff) | |
| download | dexon-sol-tools-17d49067e9cefc61fb906e1118dac1d85f6ee69b.tar.gz dexon-sol-tools-17d49067e9cefc61fb906e1118dac1d85f6ee69b.tar.zst dexon-sol-tools-17d49067e9cefc61fb906e1118dac1d85f6ee69b.zip | |
Fix missed merge conflicts
Diffstat (limited to 'packages/web3-wrapper')
| -rw-r--r-- | packages/web3-wrapper/CHANGELOG.json | 3 |
1 files changed, 0 insertions, 3 deletions
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": [ { |