From f92f0c52c6f0c10bfafd2f511151cea9c567ff23 Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Wed, 13 Jul 2016 14:33:42 +0200
Subject: [PATCH] Another stray conflict marker

---
 plugins/ChangeLogPlugin/ChangeLog.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/ChangeLogPlugin/ChangeLog.txt b/plugins/ChangeLogPlugin/ChangeLog.txt
index c989647fbb..3d6ffd77c9 100644
--- a/plugins/ChangeLogPlugin/ChangeLog.txt
+++ b/plugins/ChangeLogPlugin/ChangeLog.txt
@@ -68,7 +68,6 @@ A new, infill type that’s easily breakable, introduced specially for support.
 
 *Support Roofs
 A new sub-feature to reduce scars the support leaves on overhangs.
->>>>>>> 24c8773... Update changelog with corrections done after release
 
 *Support Towers
 Specialized support for tiny overhang areas.