diff options
| -rw-r--r-- | CHANGELOG.md | 7 |
1 files changed, 6 insertions, 1 deletions
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_ ------------------------ |