diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-08-22 17:11:33 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-08-22 17:11:33 +0800 |
| commit | 4207400f8a9ebd8e7cbf0b7f9edf72e6f01db7db (patch) | |
| tree | c188a96044d78d9446213fe565152d13a33a0858 | |
| parent | 40f4ccd8887af722d7c26e705e69b8a7980b584d (diff) | |
| download | dexon-sol-tools-4207400f8a9ebd8e7cbf0b7f9edf72e6f01db7db.tar dexon-sol-tools-4207400f8a9ebd8e7cbf0b7f9edf72e6f01db7db.tar.gz dexon-sol-tools-4207400f8a9ebd8e7cbf0b7f9edf72e6f01db7db.tar.bz2 dexon-sol-tools-4207400f8a9ebd8e7cbf0b7f9edf72e6f01db7db.tar.lz dexon-sol-tools-4207400f8a9ebd8e7cbf0b7f9edf72e6f01db7db.tar.xz dexon-sol-tools-4207400f8a9ebd8e7cbf0b7f9edf72e6f01db7db.tar.zst dexon-sol-tools-4207400f8a9ebd8e7cbf0b7f9edf72e6f01db7db.zip | |
Fix merge conflicts in a changelog
| -rw-r--r-- | CHANGELOG.md | 5 |
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) |