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/CHANGELOG.json') 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