From d8153f701017e267f26c06071964506db0e01d8d Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 27 Jul 2016 12:42:22 +0200
Subject: [PATCH] Whoops, remove conflict marker

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

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8dda32941..223a08e05 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -35,7 +35,6 @@ Fixed
 - 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
 ------