From 054df8427dc6480bad1f782371a6b7c3ee199574 Mon Sep 17 00:00:00 2001
From: Herbert Valerio Riedel <hvr@gnu.org>
Date: Sat, 6 Dec 2014 13:50:30 +0100
Subject: Kill spurious line from changelog

[skip ci]
---
 changelog.md | 1 -
 1 file changed, 1 deletion(-)

(limited to 'changelog.md')

diff --git a/changelog.md b/changelog.md
index 66caaeb..6ef8de8 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Changelog for [`unix` package](http://hackage.haskell.org/package/unix)
 
 ## 2.7.0.2  *TBA*
-- 
cgit v1.2.3