From ecf358b53aba77525ca0cbee32827d8eea2678d1 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 2 Aug 2016 15:25:14 +0200
Subject: [PATCH] Update changelog

[ci skip]
---
 CHANGELOG.asciidoc | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 67f2cfc0a..599337626 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -51,6 +51,7 @@ Fixed
 - Fixed default `;o` and `;O` bindings
 - Fixed local storage not working (and possible other bugs) when using a
   relative path with `--basedir`.
+- Fixed crash when deleting a quickmark with Ctrl-D
 
 v0.8.1
 ------
@@ -63,18 +64,6 @@ Fixed
   X .app currently.
 - Hide Harfbuzz warning with the OS X .app
 
-v0.8.1
-------
-
-Fixed
-~~~~~
-
-- Fix crash when pressing enter without a command
-- Adjust error message to point out QtWebEngine is unsupported with the OS
-  X .app currently.
-- Hide Harfbuzz warning with the OS X .app
->>>>>>> 95d1721... Release v0.8.1
-
 v0.8.0
 ------