From ebb56ebe4dd0cbecd6d19b5741ddf52c96a0176d Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Sun, 4 Nov 2018 13:43:39 -0600
Subject: add changelog for #3414

---
 CONTRIBUTORS.txt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'CONTRIBUTORS.txt')

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 6eb42c18c..79e4287d2 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -230,7 +230,6 @@ Contributors
 - Antti Haapala, 2013/11/15
 
 - Amit Mane, 2014/01/23
-<<<<<<< HEAD
 
 - Fenton Travers, 2014/05/06
 
-- 
cgit v1.2.3