[commit: packages/unix] master, safefixes710again: Kill spurious line from changelog (054df84)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/unix

On branches: master,safefixes710again
Link       : http://ghc.haskell.org/trac/ghc/changeset/054df8427dc6480bad1f782371a6b7c3ee199574/unix

>---------------------------------------------------------------

commit 054df8427dc6480bad1f782371a6b7c3ee199574
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Dec 6 13:50:30 2014 +0100

    Kill spurious line from changelog
    
    [skip ci]


>---------------------------------------------------------------

054df8427dc6480bad1f782371a6b7c3ee199574
 changelog.md | 1 -
 1 file changed, 1 deletion(-)

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*