From 9bcd550f0ad12c46081350c4f56e340f6ba2d9bf Mon Sep 17 00:00:00 2001
From: Zestyr <zestyr@protonmail.com>
Date: Wed, 28 Jun 2017 17:55:44 +0200
Subject: [PATCH] Merge changelog

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7659c8304..585163150 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,7 +29,6 @@ at anytime.
   * Fix shutdown of the blob tracker by Session
   * Fixed claim_new_support docstrings
   * Fix default directories to comply to XDG
-  *
   * Fixed BlobManager causing functional tests to fail, removed its unneeded manage() loop
   * Increased max_key_fee