diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-06-19 18:56:22 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-06-19 18:56:22 +0800 |
| commit | 17d49067e9cefc61fb906e1118dac1d85f6ee69b (patch) | |
| tree | 92c8396a1ea6ea416a0756a5e92e9b49e4e30443 /packages/tslint-config/CHANGELOG.json | |
| parent | a96abe24227b54b7a038278c432b7bf8a70c22a4 (diff) | |
| download | dexon-0x-contracts-17d49067e9cefc61fb906e1118dac1d85f6ee69b.tar.gz dexon-0x-contracts-17d49067e9cefc61fb906e1118dac1d85f6ee69b.tar.zst dexon-0x-contracts-17d49067e9cefc61fb906e1118dac1d85f6ee69b.zip | |
Fix missed merge conflicts
Diffstat (limited to 'packages/tslint-config/CHANGELOG.json')
| -rw-r--r-- | packages/tslint-config/CHANGELOG.json | 3 |
1 files changed, 0 insertions, 3 deletions
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": [ |