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/tslint-config/CHANGELOG.json | 21 +++++++++++++++++++++ packages/tslint-config/CHANGELOG.md | 8 ++++++++ 2 files changed, 29 insertions(+) (limited to 'packages/tslint-config') diff --git a/packages/tslint-config/CHANGELOG.json b/packages/tslint-config/CHANGELOG.json index 4868b3983..6ae195ae7 100644 --- a/packages/tslint-config/CHANGELOG.json +++ b/packages/tslint-config/CHANGELOG.json @@ -1,5 +1,26 @@ [ { +<<<<<<< HEAD +======= + "timestamp": 1529397769, + "version": "0.4.20", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { + "version": "0.4.19", + "changes": [ + { + "note": "Incorrect publish that was unpublished" + } + ], + "timestamp": 1527810075 + }, + { +>>>>>>> 40a061a5... Updated CHANGELOGS "timestamp": 1527009133, "version": "0.4.18", "changes": [ diff --git a/packages/tslint-config/CHANGELOG.md b/packages/tslint-config/CHANGELOG.md index 56b65cadd..2a862f8e1 100644 --- a/packages/tslint-config/CHANGELOG.md +++ b/packages/tslint-config/CHANGELOG.md @@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v0.4.20 - _June 19, 2018_ + + * Dependencies updated + +## v0.4.19 - _June 1, 2018_ + + * Incorrect publish that was unpublished + ## v0.4.18 - _May 22, 2018_ * Dependencies updated -- cgit v1.2.3 From f2e0f1b2f180a783c1676120218712f50f4f93d7 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 19 Jun 2018 11:32:55 +0200 Subject: Update all package versions to match latest published to NPM --- packages/tslint-config/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/tslint-config') diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json index 452ac48a4..9cb6a2da0 100644 --- a/packages/tslint-config/package.json +++ b/packages/tslint-config/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/tslint-config", - "version": "0.4.18", + "version": "0.4.20", "engines": { "node": ">=6.12" }, @@ -34,7 +34,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/tslint-config/README.md", "devDependencies": { - "@0xproject/monorepo-scripts": "^0.1.20", + "@0xproject/monorepo-scripts": "^0.2.1", "@types/lodash": "4.14.104", "copyfiles": "^1.2.0", "make-promises-safe": "^1.1.0", -- 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/tslint-config/CHANGELOG.json | 3 --- 1 file changed, 3 deletions(-) (limited to 'packages/tslint-config') 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": [ -- cgit v1.2.3