From 45aa9ef5422203375f1958584b1b92007a3be4da Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 22 Aug 2017 11:00:24 +0200 Subject: Change CHANGELOG text --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'CHANGELOG.md') diff --git a/CHANGELOG.md b/CHANGELOG.md index 34c3013cd..eb9820662 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,13 @@ # CHANGELOG +<<<<<<< HEAD v0.9.4 - _Aug 21, 2017_ +======= + +v0.9.4 - _Aug 22, 2017_ +>>>>>>> Change CHANGELOG text ------------------------ - * Added good error message when checksummed address is submitted (#124) + * Add clear error message when checksummed address is passed to a public method (#124) v0.9.3 - _Aug 22, 2017_ ------------------------ -- cgit v1.2.3