aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2017-08-22 17:00:24 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2017-08-22 17:02:28 +0800
commit45aa9ef5422203375f1958584b1b92007a3be4da (patch)
tree3af239c10a85434290ebb0ce95622930b818f540
parentf77cc872713d0b25eba6b636ad7923f114e21e80 (diff)
downloaddexon-sol-tools-45aa9ef5422203375f1958584b1b92007a3be4da.tar
dexon-sol-tools-45aa9ef5422203375f1958584b1b92007a3be4da.tar.gz
dexon-sol-tools-45aa9ef5422203375f1958584b1b92007a3be4da.tar.bz2
dexon-sol-tools-45aa9ef5422203375f1958584b1b92007a3be4da.tar.lz
dexon-sol-tools-45aa9ef5422203375f1958584b1b92007a3be4da.tar.xz
dexon-sol-tools-45aa9ef5422203375f1958584b1b92007a3be4da.tar.zst
dexon-sol-tools-45aa9ef5422203375f1958584b1b92007a3be4da.zip
Change CHANGELOG text
-rw-r--r--CHANGELOG.md7
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_
------------------------