aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.md
diff options
context:
space:
mode:
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md5
1 files changed, 0 insertions, 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)