From 582c9a1a5cf990bb745e77021f8c97a678ad5a7b Mon Sep 17 00:00:00 2001
From: yodax <michael@kroes.email>
Date: Wed, 10 Oct 2018 08:26:03 +0200
Subject: [PATCH] Removed merge artifact from CHANGELOG.md

---
 CHANGELOG.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd559af3..2a4aae4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,6 @@ In Development
 --------------
 
 * Starting with v0.28, TLS certificate provisioning wouldn't work on new boxes until the mailinabox setup command was run a second time because of a problem with the non-interactive setup.
-<<<<<<< HEAD
-
 * Update to Nextcloud 13.0.6.
 * Update to Roundcube 1.3.7.
 * Update to Z-Push 2.4.4.