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.json13
1 files changed, 13 insertions, 0 deletions
diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json
index bd4bf06dd..1f1c8e2c0 100644
--- a/packages/web3-wrapper/CHANGELOG.json
+++ b/packages/web3-wrapper/CHANGELOG.json
@@ -1,5 +1,18 @@
[
{
+<<<<<<< HEAD
+=======
+ "timestamp": 1529397769,
+ "version": "0.7.1",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
+ "timestamp": 1528070400,
+>>>>>>> 40a061a5... Updated CHANGELOGS
"version": "0.7.0",
"changes": [
{