diff options
Diffstat (limited to 'packages/tslint-config')
| -rw-r--r-- | packages/tslint-config/CHANGELOG.json | 21 | ||||
| -rw-r--r-- | packages/tslint-config/CHANGELOG.md | 8 |
2 files changed, 29 insertions, 0 deletions
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 |