From 36c185e92140b02ea030fb8668f776891d8764a8 Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Wed, 13 Jul 2016 14:31:20 +0200
Subject: [PATCH] Remove stray git conflict markers

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

diff --git a/plugins/ChangeLogPlugin/ChangeLog.txt b/plugins/ChangeLogPlugin/ChangeLog.txt
index fea618bd97..c989647fbb 100644
--- a/plugins/ChangeLogPlugin/ChangeLog.txt
+++ b/plugins/ChangeLogPlugin/ChangeLog.txt
@@ -39,10 +39,6 @@ Per-object settings allow you to override individual profile settings per object
 *Line Width
 Line width settings added per feature: Global, Walls, Top/Bottom, Infill, Skirt, Support.
 
-<<<<<<< HEAD
-* Conical Support
-An experimental filament, cost-reduction feature, for support.
-=======
 *Pattern Settings
 Pattern settings improved per feature: Top/Bottom, Infill, Support.