aboutsummaryrefslogtreecommitdiffstats
path: root/packages/tslint-config/CHANGELOG.json
diff options
context:
space:
mode:
Diffstat (limited to 'packages/tslint-config/CHANGELOG.json')
-rw-r--r--packages/tslint-config/CHANGELOG.json21
1 files changed, 21 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": [