aboutsummaryrefslogtreecommitdiffstats
path: root/packages/web3-wrapper/CHANGELOG.json
diff options
context:
space:
mode:
Diffstat (limited to 'packages/web3-wrapper/CHANGELOG.json')
-rw-r--r--packages/web3-wrapper/CHANGELOG.json3
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": [
{