From 2a4456b9cae6515d0210e3a2aa4b511c0262849c Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
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 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'packages/tslint-config/CHANGELOG.json')

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": [
-- 
cgit