From 4207400f8a9ebd8e7cbf0b7f9edf72e6f01db7db Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 22 Aug 2017 11:11:33 +0200 Subject: Fix merge conflicts in a changelog --- CHANGELOG.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb9820662..a830106f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,6 @@ # CHANGELOG -<<<<<<< HEAD -v0.9.4 - _Aug 21, 2017_ -======= - v0.9.4 - _Aug 22, 2017_ ->>>>>>> Change CHANGELOG text ------------------------ * Add clear error message when checksummed address is passed to a public method (#124) -- cgit v1.2.3