From 2a4456b9cae6515d0210e3a2aa4b511c0262849c Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 19 Jun 2018 10:48:00 +0200 Subject: Update CHANGELOG's with publishes performed on development branch --- packages/web3-wrapper/CHANGELOG.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'packages/web3-wrapper/CHANGELOG.json') 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": [ { -- cgit v1.2.3 From 17d49067e9cefc61fb906e1118dac1d85f6ee69b Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 19 Jun 2018 12:56:22 +0200 Subject: Fix missed merge conflicts --- packages/web3-wrapper/CHANGELOG.json | 3 --- 1 file changed, 3 deletions(-) (limited to 'packages/web3-wrapper/CHANGELOG.json') 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": [ { -- cgit v1.2.3